rebuild patches

Signed-off-by: Alpha <dev@alpha93.kr>

.editorconfig

@@ -9,7 +9,7 @@ ij_any_block_comment_at_first_column = false
 ij_any_line_comment_at_first_column = false
 ij_any_line_comment_add_space = true
 max_line_length = 120
-ij_visual_guides = 80
+ij_visual_guides = 16, 80
 
 [*.tiny]
 indent_style=tab
@@ -19,6 +19,7 @@ end_of_line=crlf
 
 [*.yml]
 indent_size=2
+ij_visual_guides = 8, 80
 
 [*.patch]
 trim_trailing_whitespace=false

.github/workflows/gradle.yml

@@ -23,13 +23,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout action
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v4
 
       - name: Set up JDK ${{ matrix.java }} ${{ matrix.jdk }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: ${{ matrix.java }}
           java-version: ${{ matrix.jdk }}

.gitignore

@@ -1,63 +1,211 @@
-# JVM crash related
-core.*
+# Generated from https://gitignore.io/
+
+### Paperweight ###
+run/
+paper-api/
+paper-server/
+purpur-api/
+purpur-server/
+plazma-api/build.gradle.kts
+plazma-server/build.gradle.kts
+plazma-server/src/minecraft/
+
+### Git ###
+# Created by git when using merge tools for conflicts
+*.orig
+*.BACKUP.*
+*.BASE.*
+*.LOCAL.*
+*.REMOTE.*
+*_BACKUP_*.txt
+*_BASE_*.txt
+*_LOCAL_*.txt
+*_REMOTE_*.txt
+
+### Java ###
+*.class
+*.log
+*.jar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+replay_pid*
 
-# Intellij
-.idea/
-*.iml
-*.ipr
-*.iws
-out/
+# Kotlin DSL
+.kotlin/
 
-# Eclipse
-.classpath
-.project
-.settings/
-
-# netbeans
-nbproject/
-nbactions.xml
-
-# vscode
-.vscode/
-
-# Gradle
-!gradle-wrapper.jar
+### Gradle ###
 .gradle/
 build/
-*/build/
-run/
-javadoc/
 
-# we use maven!
-build.xml
+# Avoid ignore Gradle wrappper properties
+!gradle-wrapper.jar
+!gradle-wrapper.properties
 
-# Maven
-log/
-target/
-dependency-reduced-pom.xml
+# Cache of project
+.gradletasknamecache
 
-# various other potential build files
+# Java heap dump
+*.hprof
+
+### Eclipse ###
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
 bin/
+tmp/
+.project/
+.metadata/
+.settings/
+.loadpath/
+.recommenders/
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# Java annotation processor (APT)
+.factorypath
+
+# Annotation Processing
+.apt_generated/
+.apt_generated_test/
+
+### JetBrains ###
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# Ignore everything but code style settings and run configurations
+.idea/
+
+!.idea/codeStyles
+!.idea/runConfigurations
+
+# IntelliJ
+out/
+
+# Fleet
+.fleet/
+
+### NetBeans ###
+**/nbproject/private/
+**/nbproject/Makefile-*.mk
+**/nbproject/Package-*.bash
+nbbuild/
 dist/
-manifest.mf
+nbdist/
+.nb-gradle/
 
-# Mac
-.DS_Store/
-.DS_Store
+### Vim ###
+# Swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
 
-# vim
-.*.sw[a-p]
+# Session
+Session.vim
+Sessionx.vim
 
-# Linux temp files
+# Temporary
+.netrwhist
+
+# Auto-generated tag files
+tags
+
+# Persistent undo
+[._]*.un~
+
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Ignore all local history of files
+.history
+.ionide
+
+### Linux ###
 *~
 
-# Paperweight
-build-data/
-*-API
-*-MojangAPI
-*-Server
-paper-api-generator
-compare.txt
-*.patch
-!patches/**/*
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# iCloud generated files
+*.icloud
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk

LICENSE.md

@@ -1,23 +0,0 @@
-The MIT License (MIT)
-=====================
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the “Software”), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,24 +0,0 @@
-<div align="center">
-
-[![image](https://raw.githubusercontent.com/PlazmaMC/Plazma/main/src/resources/title-900.png)](https://github.com/PlazmaMC/Plazma)
-
-### A Server Platform for Minecraft: Java Edition based on [Paper](https://github.com/PaperMC/Paper)
-
-[![Discord](https://api.plazmamc.org/internal/cdn/discord)](https://plazmamc.org/discord)
-[![License](https://api.plazmamc.org/internal/cdn/license)](LICENSE.md)
-[![Version](https://badge.plazmamc.org/1/MC/1.21.3/Webpack)](https://plazmamc.org/downloads)
-
-[![Downloads](https://api.plazmamc.org/internal/cdn/dlcountmini)](https://plazmamc.org/downloads)
-[![Stargazers](https://api.plazmamc.org/internal/cdn/starsmini)](https://github.com/PlazmaMC/Plazma/stargazers)
-[![Forks](https://api.plazmamc.org/internal/cdn/forks)](https://github.com/PlazmaMC/Plazma/forks)
-[![Watchers](https://api.plazmamc.org/internal/cdn/watches)](https://github.com/PlazmaMC/Plazma/watchers)
-
-### [⬇️ Downloads](https://plazmamc.org/downloads)
-
-</div>
-
-[main]: https://github.com/PlazmaMC/PlazmaBukkit/blob/main/README.md
-
-> [!IMPORTANT]
-This is the branch for Plazma 1.21.2/3. If you want to know more about Plazma, please check the **[main branch][main]**.<br>
-이곳은 플라즈마의 1.21.2/3용 분기입니다. 플라즈마에 대해 자세히 알고 싶다면 **[main 분기][main]** 를 확인해주세요.

build-data/dev-imports.txt

@@ -1,14 +0,0 @@
-# You can use this file to import files from minecraft libraries into the project
-# format:
-#     <artifactId> <fileName>
-# both fully qualified and a file based syntax are accepted for <fileName>:
-#     authlib com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
-#     datafixerupper com.mojang.datafixers.DataFixerBuilder
-#     datafixerupper com/mojang/datafixers/util/Either.java
-# To import classes from the vanilla Minecraft jar use `minecraft` as the artifactId:
-#     minecraft net.minecraft.world.level.entity.LevelEntityGetterAdapter
-#     minecraft net/minecraft/world/level/entity/LevelEntityGetter.java
-# To import minecraft data files, like the default chat type, use `mc_data` as the prefix:
-#     mc_data chat_type/chat.json
-#     mc_data dimension_type/overworld.json
-#

build.gradle.kts

@@ -2,167 +2,84 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
-    java
-    `maven-publish`
-    `kotlin-dsl`
-    `always-up-to-date`
-    alias(libs.plugins.shadow) apply false
-    alias(libs.plugins.paperweight)
+    id("io.papermc.paperweight.patcher") version "2.0.0-beta.14"
 }
 
-val jdkVersion = property("jdkVersion").toString().toInt()
-val providerRepo = property("providerRepo").toString()
-val brandName = property("brandName").toString()
+paperweight {
+    upstreams.register("purpur") {
+        repo = github("PurpurMC", "Purpur")
+        ref = providers.gradleProperty("purpurRef")
 
-kotlin.jvmToolchain(jdkVersion)
-
-repositories {
-    mavenCentral()
-    maven("https://repo.papermc.io/repository/maven-public/") {
-        content { onlyForConfigurations(configurations.paperclip.name) }
-    }
-}
-
-dependencies {
-    remapper(libs.remapper)
-    decompiler(libs.decompiler)
-    paperclip(libs.paperclip)
-}
-
-allprojects {
-    apply(plugin = "java")
-    apply(plugin = "maven-publish")
-
-    java.toolchain.languageVersion.set(JavaLanguageVersion.of(jdkVersion))
-
-    publishing.repositories.maven("https://maven.pkg.github.com/$providerRepo") {
-        name = "githubPackage"
-
-        credentials {
-            username = providers.systemProperty("ghName").orElse(providers.gradleProperty("ghName")).getOrElse(System.getenv("GITHUB_NAME"))
-            password = providers.systemProperty("ghToken").orElse(providers.gradleProperty("ghToken")).getOrElse(System.getenv("GITHUB_TOKEN"))
+        patchFile {
+            path = "purpur-server/build.gradle.kts"
+            outputFile = file("plazma-server/build.gradle.kts")
+            patchFile = file("plazma-server/build.gradle.kts.patch")
+        }
+        patchFile {
+            path = "purpur-api/build.gradle.kts"
+            outputFile = file("plazma-api/build.gradle.kts")
+            patchFile = file("plazma-api/build.gradle.kts.patch")
+        }
+        patchRepo("paperApi") {
+            upstreamPath = "paper-api"
+            patchesDir = file("plazma-api/paper-patches")
+            outputDir = file("paper-api")
+        }
+        patchDir("purpurApi") {
+            upstreamPath = "purpur-api"
+            excludes = listOf("build.gradle.kts", "build.gradle.kts.patch", "paper-patches")
+            patchesDir = file("plazma-api/purpur-patches")
+            outputDir = file("purpur-api")
         }
     }
 }
 
 subprojects {
-    tasks {
-        withType<JavaCompile>().configureEach {
-            options.encoding = Charsets.UTF_8.name()
-            options.release = jdkVersion
-        }
+    apply(plugin = "java-library")
+    apply(plugin = "maven-publish")
 
-        withType<Javadoc> {
-            options.encoding = Charsets.UTF_8.name()
-        }
-
-        withType<ProcessResources> {
-            filteringCharset = Charsets.UTF_8.name()
-        }
-
-        withType<Test> {
-            testLogging {
-                showStackTraces = true
-                exceptionFormat = TestExceptionFormat.FULL
-                events(TestLogEvent.STANDARD_OUT)
-            }
+    extensions.configure<JavaPluginExtension> {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(21)
         }
     }
 
     repositories {
         mavenCentral()
-        maven("https://jitpack.io")
-        maven("https://papermc.io/repo/repository/maven-public/")
+        maven("https://repo.papermc.io/repository/maven-public/")
     }
-}
 
-paperweight {
-    serverProject = project(":${brandName.lowercase()}-server")
-
-    remapRepo = "https://repo.papermc.io/repository/maven-public/"
-    decompileRepo = "https://repo.papermc.io/repository/maven-public/"
-
-    usePaperUpstream(providers.gradleProperty("paperCommit")) {
-        withPaperPatcher {
-            apiPatchDir.set(projectDir.resolve("patches/api"))
-            apiOutputDir.set(projectDir.resolve("$brandName-API"))
-
-            serverPatchDir.set(projectDir.resolve("patches/server"))
-            serverOutputDir.set(projectDir.resolve("$brandName-Server"))
-        }
-
-        patchTasks.register("generatedApi") {
-            isBareDirectory = true
-            upstreamDirPath = "paper-api-generator/generated"
-            patchDir = projectDir.resolve("patches/generated-api")
-            outputDir = projectDir.resolve("paper-api-generator/generated")
+    tasks.withType<AbstractArchiveTask>().configureEach {
+        isPreserveFileTimestamps = false
+        isReproducibleFileOrder = true
+    }
+    tasks.withType<JavaCompile> {
+        options.encoding = Charsets.UTF_8.name()
+        options.release = 21
+        options.isFork = true
+    }
+    tasks.withType<Javadoc> {
+        options.encoding = Charsets.UTF_8.name()
+    }
+    tasks.withType<ProcessResources> {
+        filteringCharset = Charsets.UTF_8.name()
+    }
+    tasks.withType<Test> {
+        testLogging {
+            showStackTraces = true
+            exceptionFormat = TestExceptionFormat.FULL
+            events(TestLogEvent.STANDARD_OUT)
         }
     }
-}
 
-val paperRepoVal = property("paperRepo").toString()
-val paperBranch = property("paperBranch").toString()
-val purpurRepoVal = property("purpurRepo").toString()
-val purpurBranch = property("purpurBranch").toString()
-val pufferfishRepoVal = property("pufferfishRepo").toString()
-val pufferfishBranch = property("pufferfishBranch").toString()
-val isUsePufferfish = property("usePufferfish").toString().toBoolean()
-
-alwaysUpToDate {
-
-    paperRepo.set(paperRepoVal)
-    paperRef.set(paperBranch)
-    paperCommitName.set("paperCommit")
-
-    purpurRepo.set(purpurRepoVal)
-    purpurRef.set(purpurBranch)
-    purpurCommitName.set("purpurCommit")
-
-    pufferfishRepo.set(pufferfishRepoVal)
-    pufferfishRef.set(pufferfishBranch)
-    usePufferfish.set(isUsePufferfish)
-
-}
-
-tasks {
-    applyPatches {
-        dependsOn("applyGeneratedApiPatches")
-    }
-
-    rebuildPatches {
-        dependsOn("rebuildGeneratedApiPatches")
-    }
-
-    generateDevelopmentBundle {
-        apiCoordinates.set("${project.group}:${brandName.lowercase()}-api")
-        libraryRepositories.addAll(
-                "https://repo.maven.apache.org/maven2/",
-                "https://maven.pkg.github.com/$providerRepo",
-                "https://papermc.io/repo/repository/maven-public/"
-        )
-    }
-
-    clean {
-        doLast {
-            listOf(
-                ".gradle/caches",
-                "$brandName-API",
-                "$brandName-Server",
-                "paper-api-generator",
-                "run",
-
-                // remove dev environment files
-                "0001-fixup.patch",
-                "compare.txt"
-            ).forEach {
-                projectDir.resolve(it).deleteRecursively()
+    extensions.configure<PublishingExtension> {
+        repositories {
+            /*
+            maven("https://repo.papermc.io/repository/maven-snapshots/") {
+                name = "paperSnapshots"
+                credentials(PasswordCredentials::class)
             }
+             */
         }
     }
 }
-
-publishing {
-    publications.create<MavenPublication>("devBundle") {
-        artifact(tasks.generateDevelopmentBundle) {  artifactId = "dev-bundle" }
-    }
-}

buildSrc/build.gradle.kts

@@ -1,31 +0,0 @@
-plugins {
-    java
-    `kotlin-dsl`
-    id("com.gradleup.shadow") version "8.3.5"
-}
-
-kotlin.jvmToolchain(21)
-
-repositories {
-    mavenCentral()
-    maven("https://papermc.io/repo/repository/maven-public/")
-}
-
-dependencies {
-    shadow("io.papermc.paperweight:paperweight-patcher:1.6.2-SNAPSHOT")
-}
-
-tasks {
-    jar {
-        finalizedBy(shadowJar)
-    }
-
-    shadowJar {
-        archiveFileName.set("buildSrc.jar")
-        configurations = listOf(project.configurations["shadow"])
-
-        exclude("META-INF/gradle-plugins/io.papermc.paperweight.patcher.properties")
-        relocate("io.papermc.paperweight", "org.plazmamc.alwaysuptodate.internal.paperweight")
-        minimize()
-    }
-}

buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/AlwaysUpToDate.kt

@@ -1,79 +0,0 @@
-package org.plazmamc.alwaysuptodate
-
-import io.papermc.paperweight.util.Git
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.TaskProvider
-import org.plazmamc.alwaysuptodate.tasks.*
-import org.plazmamc.alwaysuptodate.utils.CheckGitTask
-import org.plazmamc.alwaysuptodate.utils.configureTask
-import org.plazmamc.alwaysuptodate.utils.flatten
-import org.plazmamc.alwaysuptodate.utils.registerTask
-
-class AlwaysUpToDate : Plugin<Project> {
-
-    @Suppress("UNUSED_VARIABLE")
-    override fun apply(target: Project): Unit = with(target) {
-
-        Git.checkForGit()
-
-        val extension = extensions.create("alwaysUpToDate", AlwaysUpToDateExtension::class.java)
-
-        val git = configureTask<CheckGitTask>("checkGitStatus", "Verify that Git is available")
-
-        fun generateTasks(
-            upstream: String,
-            provider: AlwaysUpToDateExtension.() -> Pair<Pair<Property<String>, Property<String>>, Property<String>>
-        ): Triple<TaskProvider<CheckUpstreamCommit>, TaskProvider<CreateCompareComment>, TaskProvider<CreateCompareComment>> {
-            val i = registerTask<CheckUpstreamCommit>("check$upstream", "Check if the $upstream commit is up to date") {
-                dependsOn(git)
-                val (repo, ref, commitProperty) = extension.provider().flatten()
-                this.repo.set(repo)
-                this.ref.set(ref)
-                this.commitPropertyName.set(commitProperty)
-            }
-
-            val j = registerTask<CreateCompareComment>("compare$upstream", "Create a comment comparing the $upstream commit") {
-                dependsOn(git)
-                val (repo, ref, commitProperty) = extension.provider().flatten()
-                this.repo.set(repo)
-                this.ref.set(ref)
-                this.commitPropertyName.set(commitProperty)
-                this.clear.set(false)
-            }
-
-            val k = registerTask<CreateCompareComment>(
-                "cleanCompare$upstream",
-                "Create a comment comparing the $upstream commit"
-            ) {
-                dependsOn(git)
-                val (repo, ref, commitProperty) = extension.provider().flatten()
-                this.repo.set(repo)
-                this.ref.set(ref)
-                this.commitPropertyName.set(commitProperty)
-                this.clear.set(true)
-            }
-
-            return (i to j to k).flatten()
-        }
-
-        val (checkPaper, comparePaper, cleanComparePaper) = generateTasks("Paper") { paperRepo to paperRef to paperCommitName }
-        val (checkPurpur, comparePurpur, cleanComparePurpur) = generateTasks("Purpur") { purpurRepo to purpurRef to purpurCommitName }
-
-        registerTask<SimpleUpstreamUpdateTask>("updateUpstream", "Update the upstream commit") {
-            dependsOn(git)
-            repo.convention(extension.paperRepo)
-            ref.convention(extension.paperRef)
-            workDir.set(layout.projectDirectory)
-            regex.convention("paperCommit = ")
-        }
-
-        registerTask<PurpurUpdateTask>("updateImplementation", "Update the implementation") {
-            dependsOn(git)
-            workDir.set(layout.projectDirectory)
-        }
-
-    }
-
-}

buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/AlwaysUpToDateException.kt

@@ -1,6 +0,0 @@
-package org.plazmamc.alwaysuptodate
-
-class AlwaysUpToDateException : Exception {
-    constructor(message: String) : super(message)
-    constructor(message: String, cause: Throwable?) : super(message, cause)
-}

buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/AlwaysUpToDateExtension.kt

@@ -1,20 +0,0 @@
-package org.plazmamc.alwaysuptodate
-
-import org.gradle.api.provider.Property
-
-interface AlwaysUpToDateExtension {
-
-    val paperRepo: Property<String>
-    val paperRef: Property<String>
-
-    val purpurRepo: Property<String>
-    val purpurRef: Property<String>
-
-    val pufferfishRepo: Property<String>
-    val pufferfishRef: Property<String>
-    val usePufferfish: Property<Boolean>
-
-    val paperCommitName: Property<String>
-    val purpurCommitName: Property<String>
-
-}

buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/CheckUpstreamCommit.kt

@@ -1,40 +0,0 @@
-package org.plazmamc.alwaysuptodate.tasks
-
-import org.gradle.api.Project
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
-import org.plazmamc.alwaysuptodate.AlwaysUpToDateException
-import org.plazmamc.alwaysuptodate.AlwaysUpToDateExtension
-import org.plazmamc.alwaysuptodate.utils.extension
-import org.plazmamc.alwaysuptodate.utils.flatten
-import org.plazmamc.alwaysuptodate.utils.git
-import org.plazmamc.alwaysuptodate.utils.property
-
-abstract class CheckUpstreamCommit : Task() {
-
-    @get:Input
-    abstract val repo: Property<String>
-
-    @get:Input
-    abstract val ref: Property<String>
-
-    @get:Input
-    abstract val commitPropertyName: Property<String>
-
-    override fun init(): Unit = with(project) {
-        outputs.upToDateWhen { checkCommitFor { repo to ref to commitPropertyName } }
-
-        doLast {
-            println(checkCommitFor { repo to ref to commitPropertyName })
-        }
-    }
-
-}
-
-private fun Project.getLatest(repository: String, branch: String) =
-    git("ls-remote", repository).readText()?.lines()
-        ?.first("[a-z0-9]{40}\trefs/heads/$branch".toRegex()::matches)?.split("\t")?.first()
-        ?: throw AlwaysUpToDateException("Failed to get latest commit of $repository")
-
-fun Project.checkCommitFor(block: AlwaysUpToDateExtension.() -> Pair<Pair<Property<String>, Property<String>>, Property<String>>): Boolean =
-    extension.block().flatten().let { getLatest(extension { it.first }, extension { it.second }) == property { it.third } }

buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/CreateCompareComment.kt

@@ -1,48 +0,0 @@
-package org.plazmamc.alwaysuptodate.tasks
-
-import io.papermc.paperweight.util.fromJson
-import io.papermc.paperweight.util.gson
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.TaskAction
-import org.plazmamc.alwaysuptodate.utils.property
-import paper.libs.com.google.gson.JsonObject
-import java.net.URI
-
-abstract class CreateCompareComment : Task() {
-
-    @get:Input
-    abstract val clear: Property<Boolean>
-
-    @get:Input
-    abstract val repo: Property<String>
-
-    @get:Input
-    abstract val ref: Property<String>
-
-    @get:Input
-    abstract val commitPropertyName: Property<String>
-
-    @TaskAction
-    fun create() = with(project) {
-        val builder = StringBuilder()
-        val rawRepo = URI.create(repo.get()).path.substring(1)
-
-        if (clear.get() || !file("compare.txt").exists())
-            builder.append("\n\nUpstream has released updates that appear to apply and compile correctly.")
-        else
-            builder.append(file("compare.txt").readText())
-
-        builder.append("\n\n[${rawRepo.split("/").last()} Changes]\n")
-
-        gson.fromJson<JsonObject>(
-            URI.create("https://api.github.com/repos/$rawRepo/compare/${property { commitPropertyName }}...${ref.get()}").toURL().readText()
-        )["commits"].asJsonArray.forEach { obj ->
-            obj.asJsonObject.let {
-                builder.append("$rawRepo@${it["sha"].asString.subSequence(0, 7)}: ${it["commit"].asJsonObject["message"].asString.split("\n")[0]}\n")
-            }
-        }
-        file("compare.txt").writeText(builder.toString())
-    }
-
-}

buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/GenerateMergedAPIPatch.kt

@@ -1,38 +0,0 @@
-package org.plazmamc.alwaysuptodate.tasks
-
-import io.papermc.paperweight.util.Git
-import io.papermc.paperweight.util.path
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.InputDirectory
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.TaskAction
-import org.plazmamc.alwaysuptodate.utils.addCommit
-
-abstract class GenerateMergedAPIPatch : Task() {
-
-    @get:InputDirectory
-    abstract val inputDir: DirectoryProperty
-
-    @get:Internal
-    abstract val workDir: DirectoryProperty
-
-    @get:Input
-    abstract val commitTitle: Property<String>
-
-    @get:Input
-    abstract val author: Property<String>
-
-    @get:Input
-    abstract val license: Property<String>
-
-    @TaskAction
-    fun generate() = with(workDir.path) {
-        val dotGit = resolve(".git").toFile().also(java.io.File::deleteRecursively)
-
-        inputDir.path.toFile().copyRecursively(dotGit, overwrite = true)
-        Git(this).addCommit("${commitTitle.get()}\n\n${license.get()}", "--author=${author.get()}")
-    }
-
-}

buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/GenerateMergedServerPatch.kt

@@ -1,51 +0,0 @@
-package org.plazmamc.alwaysuptodate.tasks
-
-import io.papermc.paperweight.util.Git
-import io.papermc.paperweight.util.path
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.TaskAction
-import org.plazmamc.alwaysuptodate.utils.addCommit
-import java.io.File
-import java.nio.file.Path
-
-abstract class GenerateMergedServerPatch : Task() {
-
-    @get:Internal
-    abstract val workDir: DirectoryProperty
-
-    @get:Input
-    abstract val commitTitle: Property<String>
-
-    @get:Input
-    abstract val author: Property<String>
-
-    @get:Input
-    abstract val license: Property<String>
-
-    @TaskAction
-    fun generate() = with(workDir.path) {
-        val dotGit = resolve(".git").toFile().also(java.io.File::deleteRecursively)
-
-        copySource(this)
-
-        val paper = resolve("../.gradle/caches/paperweight/upstreams/paper/Paper-Server")
-        copySource(paper)
-
-        Git(paper).addCommit("Vanilla Sources", "--author=Automated <auto@mated.null>")
-
-        paper.resolve(".git").toFile().copyRecursively(dotGit, overwrite = true)
-        Git(this).addCommit("${commitTitle.get()}\n\n${license.get()}", "--author=${author.get()}")
-    }
-
-}
-
-internal fun copySource(dir: Path) = with(dir.resolve(".gradle/caches/paperweight/mc-dev-sources")) {
-    val target = dir.resolve("src/main")
-    resolve("net").toFile().copyRecursively(target.resolve("java/net").toFile(), overwrite = true)
-    resolve("com").toFile().copyRecursively(target.resolve("java/com").toFile(), overwrite = true)
-    resolve("data").toFile().copyRecursively(target.resolve("resources/data").toFile(), overwrite = true)
-    resolve("assets").toFile().copyRecursively(target.resolve("resources/assets").toFile(), overwrite = true)
-}

buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/PurpurUpdateTask.kt

@@ -1,252 +0,0 @@
-package org.plazmamc.alwaysuptodate.tasks
-
-import io.papermc.paperweight.patcher.tasks.CheckoutRepo
-import io.papermc.paperweight.util.Git
-import io.papermc.paperweight.util.cache
-import io.papermc.paperweight.util.path
-import io.papermc.paperweight.util.set
-import org.gradle.api.file.Directory
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.provider.Provider
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.OutputDirectory
-import org.gradle.api.tasks.TaskAction
-import org.gradle.api.tasks.TaskProvider
-import org.plazmamc.alwaysuptodate.utils.*
-import java.io.File
-import java.nio.file.Path
-import java.util.*
-import kotlin.io.path.ExperimentalPathApi
-import kotlin.io.path.name
-import kotlin.io.path.walk
-
-@Deprecated("It will soon be changed to be available for other upstreams.")
-abstract class PurpurUpdateTask : Task() {
-
-    private val pufferfishHeader = """
-        Pufferfish
-        Copyright (C) ${Calendar.getInstance().get(Calendar.YEAR)} Pufferfish Studios LLC
-
-        This program is free software: you can redistribute it and/or modify
-        it under the terms of the GNU General Public License as published by
-        the Free Software Foundation, either version 3 of the License, or
-        (at your option) any later version.
-
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-        GNU General Public License for more details.
-
-        You should have received a copy of the GNU General Public License
-        along with this program.  If not, see <http://www.gnu.org/licenses/>.
-    """.trimIndent()
-    private val pufferfishAuthor = "Kevin Raneri <kevin.raneri@gmail.com>"
-    private val purpurHeader = """
-        PurpurMC
-        Copyright (C) ${Calendar.getInstance().get(Calendar.YEAR)} PurpurMC
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
-    """.trimIndent()
-    private val purpurAuthor = "granny <contact@granny.dev>"
-
-    @get:Internal
-    abstract val workDir: DirectoryProperty
-
-    @get:OutputDirectory
-    abstract val purpurDir: DirectoryProperty
-
-    @get:OutputDirectory
-    abstract val pufferfishDir: DirectoryProperty
-
-    override fun init(): Unit = with(project) {
-        val wd = layout.cache.resolve("alwaysUpToDate/update/purpur").also { it.toFile().deleteRecursively() }
-        workDir.set(wd)
-
-        val compare =
-            configureTask<CreateCompareComment>("createPurpurCompareComment", "Create Purpur Compare Comment") {
-                clear.convention(true)
-                repo.convention(extension.purpurRepo)
-                ref.convention(extension.purpurRef)
-                commitPropertyName.convention(extension.purpurCommitName)
-            }
-
-        val paper = dependsOn<SimpleUpstreamUpdateTask>("updatePaper", "Update Paper") {
-            outputs.upToDateWhen { checkCommitFor { repo to ref to paperCommitName } }
-            dependsOn(compare)
-            repo.convention(extension.paperRepo)
-            ref.convention(extension.paperRef)
-            regex.convention("paperCommit = ")
-            workDir.set(layout.projectDirectory)
-        }
-
-        fun checkout(
-            name: String, repo: Provider<String>, ref: Provider<String>, regex: String, block: CheckoutRepo.() -> Unit
-        ): Pair<TaskProvider<CheckoutRepo>, Directory> {
-            val updatePaper = configureTask<SimpleUpstreamUpdateTask>("update${name}Paper", "Update $name's Paper") {
-                this.repo.convention(extension.paperRepo)
-                this.ref.convention(extension.paperRef)
-                this.regex.convention(regex)
-                this.workDir.set(wd.resolve(name))
-            }
-
-            val checkout = dependsOn<CheckoutRepo>("checkout$name", "Checkout $name") {
-                this.dependsOn(paper)
-                this.repoName.convention(name)
-                this.url.convention(repo)
-                this.ref.convention(ref)
-                this.workDir.set(wd)
-
-                this.block()
-                // this.finalizedBy(updatePaper)
-            }
-
-            return checkout to checkout.flatMap { it.outputDir }.get()
-        }
-
-        val (checkoutPufferfish, pufferfish) =
-            checkout("Pufferfish", extension.pufferfishRepo, extension.pufferfishRef, "paperRef=") {
-                onlyIf { extension { usePufferfish } }
-            }
-        val (checkoutPurpur, purpur) =
-            checkout("Purpur", extension.purpurRepo, extension.purpurRef, "paperCommit = ") {}
-
-        pufferfishDir.set(pufferfish)
-        purpurDir.set(purpur)
-
-        val preparePurpur = configureTask("preparePurpur", "Prepare Purpur Sources") {
-            mustRunAfter(paper)
-            dependsOn(checkoutPurpur)
-            doLast { Gradle(purpur.path)("applyPatches").executeOut() }
-        }
-        val preparePufferfish = configureTask("preparePufferfish", "Prepare Pufferfish Sources") {
-            onlyIf { extension { usePufferfish } }
-            mustRunAfter(paper)
-            dependsOn(checkoutPurpur, checkoutPufferfish)
-            doLast {
-                val base = pufferfish.path.resolve("patches").also { it.toFile().deleteRecursively() }
-                val source = purpur.path.resolve("patches")
-                source.resolve("server").copyPatch(base.resolve("server"), "Pufferfish-Server-Changes")
-                source.resolve("api").copyPatch(base.resolve("api"), "Pufferfish-API-Changes")
-                Gradle(pufferfish.path)("applyPatches").executeOut()
-            }
-        }
-
-        dependsOn(preparePurpur, preparePufferfish)
-
-        val serverPatch =
-            configureTask<GenerateMergedServerPatch>("generateMergedServerPatches", "Generate Merged Server Patch") {
-                dependsOn(preparePurpur)
-                if (!extension { usePufferfish }) {
-                    workDir.convention(purpur.dir("Purpur-Server"))
-                    commitTitle.convention("Purpur Server Changes")
-                    license.convention(purpurHeader)
-                    author.convention(purpurAuthor)
-                    return@configureTask
-                }
-
-                dependsOn(preparePufferfish)
-                workDir.convention(pufferfish.dir("pufferfish-server"))
-                commitTitle.convention("Pufferfish Server Changes")
-                license.convention(pufferfishHeader)
-                author.convention(pufferfishAuthor)
-
-                doLast {
-                    val dotGit = pufferfish.dir("pufferfish-server/.git").path.toFile()
-
-                    purpur.path.resolve("Purpur-Server").let {
-                        val purpurDotGit = it.resolve(".git").toFile().also(File::deleteRecursively)
-
-                        copySource(it)
-                        dotGit.copyRecursively(purpurDotGit, overwrite = true)
-                        Git(it).addCommit("Purpur Server Changes\n\n$purpurHeader", "--author=$purpurAuthor")
-                    }
-                }
-            }
-
-        val pufferfishAPIChanges = configureTask<GenerateMergedAPIPatch>(
-            "generateMergedPufferfishAPIPatch",
-            "Generate Merged Pufferfish API Patch"
-        ) {
-            dependsOn(preparePufferfish)
-            inputDir.convention(pufferfish.dir(".gradle/caches/paperweight/upstreams/paper/Paper-API/.git"))
-            workDir.convention(pufferfish.dir("pufferfish-api"))
-            commitTitle.convention("Pufferfish API Changes")
-            license.convention(pufferfishHeader)
-            author.convention(pufferfishAuthor)
-        }
-
-        val apiPatch = configureTask<GenerateMergedAPIPatch>(
-            "generateMergedAPIPatches",
-            "Generate Merged API Patches"
-        ) {
-            dependsOn(preparePurpur)
-            if (extension { usePufferfish }) dependsOn(pufferfishAPIChanges)
-
-            workDir.convention(purpur.dir("Purpur-API"))
-            commitTitle.convention("Purpur API Changes")
-            license.convention(purpurHeader)
-            author.convention(purpurAuthor)
-            inputDir.convention(
-                if (extension { usePufferfish }) pufferfish.dir("pufferfish-api/.git")
-                else purpur.dir(".gradle/caches/paperweight/upstreams/paper/Paper-API/.git")
-            )
-        }
-
-        dependsOn("buildPatches", "Build Merged Patches") {
-            dependsOn(serverPatch, apiPatch)
-            doLast { Gradle(purpur.path)("rebuildPatches").executeOut() }
-        }
-    }
-
-    @TaskAction
-    fun update() = with(project) {
-        val purpur = purpurDir.path
-        val pufferfish = if (extension { usePufferfish }) pufferfishDir.path else null
-
-        val patches = purpur.resolve("patches")
-        with(layout.projectDirectory.path.resolve("patches")) {
-            patches.resolve("server").copyPatch( resolve("server"),
-                if (pufferfish == null) "" else "Pufferfish-Server-Changes",
-                "Purpur-Server-Changes"
-            )
-
-            patches.resolve("api").copyPatch( resolve("api"),
-                if (pufferfish == null) "" else "Pufferfish-API-Changes",
-                "Purpur-API-Changes"
-            )
-        }
-
-        file("gradle.properties").let {
-            it.writeText(
-                it.readText().replace("purpurCommit = .*".toRegex(), "purpurCommit = ${Git(purpur).revParse()}")
-            )
-        }
-    }
-
-}
-
-@OptIn(ExperimentalPathApi::class)
-private fun Path.copyPatch(to: Path, vararg name: String) = walk().sorted()
-    .filter { entry -> name.filter { it != "" }.any { entry.name.endsWith("$it.patch") } }.map(Path::toFile)
-    .forEachIndexed { count, patch ->
-        patch.copyTo(
-            to.resolve("${count + 1}".padStart(4, '0') + "-" + name.first { patch.name.substring(5) == "$it.patch" } + ".patch").toFile(),
-            overwrite = true
-        )
-    }

buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/SimpleUpstreamUpdateTask.kt

@@ -1,48 +0,0 @@
-package org.plazmamc.alwaysuptodate.tasks
-
-import io.papermc.paperweight.util.Git
-import io.papermc.paperweight.util.path
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.InputDirectory
-import org.gradle.api.tasks.Optional
-import org.gradle.api.tasks.TaskAction
-import org.plazmamc.alwaysuptodate.AlwaysUpToDateException
-import org.plazmamc.alwaysuptodate.utils.dependsOn
-import org.plazmamc.alwaysuptodate.utils.extension
-
-abstract class SimpleUpstreamUpdateTask : Task() {
-
-    @get:Input
-    abstract val repo: Property<String>
-
-    @get:Input
-    abstract val ref: Property<String>
-
-    @get:InputDirectory
-    abstract val workDir: DirectoryProperty
-
-    @get:Input
-    abstract val regex: Property<String>
-
-    override fun init(): Unit = with(project) {
-        dependsOn<CreateCompareComment>("createCompareComment", "Create Paper Compare Comment") {
-            onlyIf { !this@SimpleUpstreamUpdateTask.state.upToDate }
-            clear.convention(false)
-            repo.convention(extension.paperRepo)
-            ref.convention(extension.paperRef)
-            commitPropertyName.convention(extension.paperCommitName)
-        }
-    }
-
-    @TaskAction
-    fun update() = (Git(workDir.path)("ls-remote", repo.get()).readText()?.lines()
-        ?.filterNot("[a-z0-9]{40}\trefs/heads/${ref.get()}".toRegex()::matches)?.first()?.split("\t")?.first()
-        ?: throw AlwaysUpToDateException("Failed to get latest commit")).let { commit ->
-        workDir.file("gradle.properties").path.toFile().let {
-            it.writeText(it.readText().replace("${regex.get()}.*".toRegex(), "${regex.get()}$commit"))
-        }
-    }
-
-}

buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/Task.kt

@@ -1,13 +0,0 @@
-package org.plazmamc.alwaysuptodate.tasks
-
-import org.gradle.api.DefaultTask
-
-abstract class Task : DefaultTask() {
-
-    protected open fun init() {}
-
-    init {
-        this.init()
-    }
-
-}

buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/utils/Git.kt

@@ -1,33 +0,0 @@
-package org.plazmamc.alwaysuptodate.utils
-
-import io.papermc.paperweight.util.Git
-import org.gradle.api.tasks.TaskAction
-import org.plazmamc.alwaysuptodate.tasks.Task
-import java.nio.file.Path
-import kotlin.io.path.exists
-
-val Git.path: Path
-    get() = Git::class.java.getDeclaredField("repo").apply { isAccessible = true }.get(this) as Path
-
-abstract class CheckGitTask : Task() {
-
-    @TaskAction
-    fun checkGit() = Git.checkForGit()
-
-}
-
-fun Git.revParse(): String = this("rev-parse", "HEAD").captureOut(true).out.trim()
-
-fun Git.addCommit(vararg args: String) {
-    this("add", ".").executeSilently()
-    this("commit", "-m", *args).executeSilently()
-    this.wait()
-}
-
-fun Git.wait() {
-    val lockFile = path.resolve(".git/gc.pid")
-    while (lockFile.exists()) {
-        println("detected lockfile, waiting for it to be removed")
-        Thread.sleep(1000)
-    }
-}

buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/utils/Gradle.kt

@@ -1,36 +0,0 @@
-package org.plazmamc.alwaysuptodate.utils
-
-import io.papermc.paperweight.util.Command
-import io.papermc.paperweight.util.directory
-import org.plazmamc.alwaysuptodate.AlwaysUpToDateException
-import java.nio.file.Path
-import kotlin.io.path.notExists
-
-class Gradle(private val repo: Path) {
-
-    init {
-        if (repo.resolve("gradle").notExists())
-            throw AlwaysUpToDateException("Git repository does not exist: $repo")
-    }
-
-    operator fun invoke(vararg args: String): Command {
-        val builder = ProcessBuilder(
-            "java",
-            "-cp",
-            "gradle/wrapper/gradle-wrapper.jar",
-            "org.gradle.wrapper.GradleWrapperMain",
-            *args,
-            "--no-daemon",
-            "--stacktrace"
-        ).directory(repo)
-        val command = builder.command()
-            .joinToString(" ") { if (it.codePoints().anyMatch(Character::isWhitespace)) "\"$it\"" else it }
-
-        return try {
-            Command(builder, command)
-        } catch (e: Exception) {
-            throw AlwaysUpToDateException("Failed to execute command: $command", e)
-        }
-    }
-
-}

buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/utils/Tasks.kt

@@ -1,116 +0,0 @@
-package org.plazmamc.alwaysuptodate.utils
-
-import io.papermc.paperweight.util.Git
-import io.papermc.paperweight.util.configureTask
-import io.papermc.paperweight.util.path
-import org.gradle.api.DefaultTask
-import org.gradle.api.Project
-import org.gradle.api.Task
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.TaskProvider
-import org.gradle.kotlin.dsl.get
-import org.plazmamc.alwaysuptodate.AlwaysUpToDateExtension
-
-private var extensionAccessor: AlwaysUpToDateExtension? = null
-    set(value) {
-        if (field != null) throw IllegalAccessException("ExtensionAccessor already initialized")
-        field = value
-    }
-
-val Project.extension: AlwaysUpToDateExtension
-    get() {
-        if (extensionAccessor == null) extensionAccessor =
-            project.extensions["alwaysUpToDate"] as AlwaysUpToDateExtension
-        return extensionAccessor!!
-    }
-
-val Project.git: Git get() = Git(layout.projectDirectory.path)
-
-fun <T> Project.extension(block: AlwaysUpToDateExtension.() -> Property<T>): T =
-    extension.block().get()
-
-fun Project.property(block: AlwaysUpToDateExtension.() -> Property<String>) =
-    this.property(extension(block)) as String
-
-inline fun <reified T : Task> Task.dependsOn(
-    name: String,
-    description: String,
-    noinline block: T.() -> Unit = {}
-): TaskProvider<T> =
-    project.configureTask<T>(name, description, block).also { this.dependsOn(it) }
-
-@JvmName("dependsOnDefaultTask")
-fun Task.dependsOn(
-    name: String,
-    description: String,
-    block: DefaultTask.() -> Unit = {}
-): TaskProvider<DefaultTask> =
-    this.dependsOn<DefaultTask>(name, description, block)
-
-inline fun <reified T : Task> Task.finalizedBy(
-    name: String,
-    description: String,
-    noinline block: T.() -> Unit = {}
-): TaskProvider<T> =
-    project.configureTask<T>(name, description, block).also { this.finalizedBy(it) }
-
-@JvmName("finalizedByDefaultTask")
-fun Task.finalizedBy(
-    name: String,
-    description: String,
-    block: DefaultTask.() -> Unit = {}
-): TaskProvider<DefaultTask> =
-    this.finalizedBy<DefaultTask>(name, description, block)
-
-inline fun <reified T : Task> Task.mustRunAfter(
-    name: String,
-    description: String,
-    noinline block: T.() -> Unit = {}
-): TaskProvider<T> =
-    project.configureTask<T>(name, description, block).also { this.mustRunAfter(it) }
-
-@JvmName("mustRunAfterDefaultTask")
-fun Task.mustRunAfter(
-    name: String,
-    description: String,
-    block: DefaultTask.() -> Unit = {}
-): TaskProvider<DefaultTask> =
-    this.mustRunAfter<DefaultTask>(name, description, block)
-
-inline fun <reified T : Task> Project.configureTask(
-    name: String,
-    description: String,
-    noinline block: T.() -> Unit = {}
-): TaskProvider<T> =
-    tasks.configureTask<T>(name) {
-        this.group = "always up to date"
-        this.description = description
-        this.block()
-    }
-
-@JvmName("configureDefaultTask")
-fun Project.configureTask(
-    name: String,
-    description: String,
-    block: DefaultTask.() -> Unit = {}
-): TaskProvider<DefaultTask> =
-    this.configureTask<DefaultTask>(name, description, block)
-
-inline fun <reified T : Task> Project.registerTask(
-    name: String,
-    description: String,
-    crossinline block: T.() -> Unit = {}
-): TaskProvider<T> =
-    tasks.register(name, T::class.java) {
-        this.group = "always up to date"
-        this.description = description
-        this.block()
-    }
-
-@JvmName("registerDefaultTask")
-fun Project.registerTask(
-    name: String,
-    description: String,
-    block: DefaultTask.() -> Unit = {}
-): TaskProvider<DefaultTask> =
-    this.registerTask<DefaultTask>(name, description, block)

buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/utils/Utils.kt

@@ -1,3 +0,0 @@
-package org.plazmamc.alwaysuptodate.utils
-
-fun <A, B, C> Pair<Pair<A, B>, C>.flatten() = Triple(first.first, first.second, second)

buildSrc/src/main/resources/META-INF/gradle-plugins/always-up-to-date.properties

@@ -1 +0,0 @@
-implementation-class=org.plazmamc.alwaysuptodate.AlwaysUpToDate

gradle.properties

@@ -1,29 +1,10 @@
-org.gradle.daemon = true
-org.gradle.caching = true
-org.gradle.parallel = true
-org.gradle.vfs.watch = false
-org.gradle.jvmargs = -Xmx4G -Dfile.encoding=UTF-8 -Dgraal.CompilerConfiguration=community -Dgraal.UsePriorityInlining=true -Dgraal.Vectorization=true -Dgraal.OptDuplication=true -Dgraal.SpeculativeGuardMovement=true -Dgraal.WriteableCodeCache=true
+group=org.plazmamc.plazma
+version=1.21.4-R0.1-SNAPSHOT
+mcVersion=1.21.4
 
-paper.runMemoryGb = 8
-paper.runDisableWatchdog = true
+purpurRef=a9862d7ec77a2b7690e73e635a5829f1596be84e
 
-group = org.plazmamc.plazma
-brandKey = plazmamc:plazma
-brandName = Plazma
-providerName = PlazmaMC
-providerRepo = PlazmaMC/PlazmaBukkit
-
-version = 1.21.3-R0.1-SNAPSHOT
-mcVersion = 1.21.3
-jdkVersion = 21
-
-paperRepo = https://github.com/PaperMC/Paper
-paperBranch = master
-purpurRepo = https://github.com/PurpurMC/Purpur
-purpurBranch = ver/1.21.3
-pufferfishRepo = https://github.com/pufferfish-gg/Pufferfish
-pufferfishBranch = ver/1.21
-usePufferfish = false
-
-paperCommit = be886cf4e7ba906a3e79d9d38835d35abf60a0ce
-purpurCommit = c6802b0a27f1f8faac4ad30f902810fd0ed8051e
+org.gradle.configuration-cache=true
+org.gradle.caching=true
+org.gradle.parallel=true
+org.gradle.vfs.watch=false

gradle/libs.versions.toml

@@ -1,15 +1,2 @@
-[versions]
-shadow = "8.3.5"
-remapper = "0.10.3"
-paperclip = "3.0.3"
-paperweight = "1.7.4"
-decompiler = "1.10.1"
-
-[libraries]
-paperclip = { group = "io.papermc", name = "paperclip", version.ref = "paperclip" }
-remapper = { group = "net.fabricmc", name = "tiny-remapper", version.ref="remapper" }
-decompiler = { group = "org.vineflower", name = "vineflower", version.ref = "decompiler" }
-
-[plugins]
-shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
-paperweight = { id = "io.papermc.paperweight.patcher", version.ref = "paperweight" }
+# This file was generated by the Gradle 'init' task.
+# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

initDev

@@ -1,72 +0,0 @@
-#!/bin/bash
-# To initialize your development environment,
-# run below command in your terminal:
-# source ./initDev
-
-export PROJECT_DIR=$(pwd)
-
-alias api="cd $PROJECT_DIR/*-API"
-alias srv="cd $PROJECT_DIR/*-Server"
-
-alias g="./gradlew"
-alias c="clear;"
-
-alias ap="./gradlew --no-rebuild applyPatches"
-alias aap="./gradlew --no-rebuild applyAPIPatches"
-alias agp="./gradlew --no-rebuild applyGeneratedAPIPatches"
-alias asp="./gradlew --no-rebuild applyServerPatches"
-
-alias rp="./gradlew --no-rebuild rebuildPatches"
-alias rap="./gradlew --no-rebuild rebuildAPIPatches"
-alias rgp="./gradlew --no-rebuild rebuildGeneratedAPIPatches"
-alias rsp="./gradlew --no-rebuild rebuildServerPatches"
-
-alias run="./gradlew runDevServer"
-alias build="./gradlew build"
-alias reobf="./gradlew createReobfPaperclipJar"
-alias mojmap="./gradlew createMojmapPaperclipJar"
-
-alias lg="git log --oneline base..HEAD"
-alias rc="git rebase --autosquash -i base"
-alias rcc="git rebase --continue"
-
-# generate Fixup patches for Server
-function fs() {
-    cd ./*-Server || exit 1
-    garg="."
-    [[ "$1" == "-x" ]] && garg="--amend"
-
-    git add .
-    git commit "$garg" -m "fixup"
-    git format-patch -1
-    mv 0001-fixup.patch ../
-
-    cd ../
-}
-
-# generate Fixup patches for API
-function fa() {
-    cd ./*-API || exit 1
-    garg="."
-    [[ "$1" == "-x" ]] && garg="--amend"
-
-    git add .
-    git commit "$garg" -m "fixup"
-    git format-patch -1
-    mv 0001-fixup.patch ../
-
-    cd ../
-}
-
-# ReApply Server Patches
-function rasp() {
-    rm -rf ./*-Server
-    ./gradlew applyServerPatches
-}
-
-# Commit Updated Upstream
-function cuu() {
-    # shellcheck disable=SC2059
-    printf "Updated Upstream ($1)$(/bin/cat compare.txt)" | git commit -F -
-}
-

libs/api.versions.toml

@@ -1,33 +0,0 @@
-[versions]
-gson = "2.10.1"
-joml = "1.10.5"
-guava = "32.1.2-jre"
-sentry = "5.4.0"
-jspecify = "1.0.0"
-fastutil = "8.5.6"
-findbugs = "1.3.9"
-slf4j-api = "2.0.9"
-brigadier = "1.2.9"
-bungeechat = "1.20-R0.2"
-json-simple = "1.1.1"
-annotations = "24.0.1"
-checkerqual = "3.21.0"
-
-[libraries]
-joml = { group = "org.joml", name = "joml", version.ref = "joml" }
-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
-guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
-sentry = { group = "io.sentry", name = "sentry", version.ref = "sentry" }
-jspecify = { group = "org.jspecify", name = "jspecify", version.ref = "jspecify" }
-fastutil = { group = "it.unimi.dsi", name = "fastutil", version.ref = "fastutil" }
-findbugs = { group = "com.google.code.findbugs", name = "jsr305", version.ref = "findbugs" }
-brigadier = { group = "com.mojang", name = "brigadier", version.ref = "brigadier" }
-slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j-api" }
-bungeechat = { group = "net.md-5", name = "bungeecord-chat", version.ref = "bungeechat" }
-jsonsimple = { group = "com.googlecode.json-simple", name = "json-simple", version.ref = "json-simple" }
-annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }
-checkerqual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checkerqual" }
-
-[bundles]
-api = [ "jspecify", "guava", "gson", "joml", "fastutil", "slf4j-api", "sentry", "brigadier" ]
-annotations = [ "annotations", "checkerqual" ]

libs/common.versions.toml

@@ -1,47 +0,0 @@
-[versions]
-asm = "9.7.1"
-log4j = "2.19.0"
-junit = "1.10.0"
-mockito = "5.14.1"
-jupiter = "5.10.0"
-hamcrest = "2.2"
-snakeyaml = "2.2"
-adventure = "4.17.0"
-commons-lang2 = "2.6"
-commons-lang3 = "3.12.0"
-maven-provider = "3.9.6"
-maven-resolver = "1.9.18"
-
-[libraries]
-junit = { group = "org.junit.platform", name = "junit-platform-suite-engine", version.ref = "junit" }
-mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "jupiter" }
-hamcrest = { group = "org.hamcrest", name = "hamcrest", version.ref = "hamcrest" }
-snakeyaml = { group = "org.yaml", name = "snakeyaml", version.ref = "snakeyaml" }
-
-asm-head = { group = "org.ow2.asm", name = "asm", version.ref = "asm" }
-asm-tree = { group = "org.ow2.asm", name = "asm-tree", version.ref = "asm" }
-asm-commons = { group = "org.ow2.asm", name = "asm-commons", version.ref = "asm" }
-log4j-api = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" }
-log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" }
-log4j-iostreams = { group = "org.apache.logging.log4j", name = "log4j-iostreams", version.ref = "log4j" }
-maven-provider = { group = "org.apache.maven", name = "maven-resolver-provider", version.ref = "maven-provider" }
-maven-connector = { group = "org.apache.maven.resolver", name = "maven-resolver-connector-basic", version.ref = "maven-resolver" }
-maven-transport = { group = "org.apache.maven.resolver", name = "maven-resolver-transport-http", version.ref = "maven-resolver" }
-commons-lang2 = { group = "commons-lang", name = "commons-lang", version.ref = "commons-lang2" }
-commons-lang3 = { group = "org.apache.commons", name = "commons-lang3", version.ref = "commons-lang3" }
-
-adventure-bom = { group = "net.kyori", name = "adventure-bom", version.ref = "adventure" }
-adventure-api = { group = "net.kyori", name = "adventure-api", version.ref = "adventure" }
-adventure-slf4j = { group = "net.kyori", name = "adventure-text-logger-slf4j", version.ref = "adventure" }
-adventure-minimessage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "adventure" }
-adventure-serializer-gson = { group = "net.kyori", name = "adventure-text-serializer-gson", version.ref = "adventure" }
-adventure-serializer-ansi = { group = "net.kyori", name = "adventure-text-serializer-ansi", version.ref = "adventure" }
-adventure-serializer-plain = { group = "net.kyori", name = "adventure-text-serializer-plain", version.ref = "adventure" }
-adventure-serializer-legacy = { group = "net.kyori", name = "adventure-text-serializer-legacy", version.ref = "adventure" }
-
-[bundles]
-asm = [ "asm-head", "asm-commons" ]
-test = [ "jupiter", "hamcrest", "mockito", "asm-tree", "junit" ]
-maven = [ "maven-connector", "maven-transport" ]
-adventure = [ "adventure-api", "adventure-slf4j", "adventure-minimessage", "adventure-serializer-gson", "adventure-serializer-plain", "adventure-serializer-legacy" ]

libs/server.versions.toml

@@ -1,56 +0,0 @@
-[versions]
-art = "2.0.3"
-tca = "1.3.0"
-upnp = "1.0"
-ansi = "1.0.3"
-jansi = "3.21.0"
-rhino = "1.7.14"
-mysql = "9.1.0"
-flare = "34637f3f87"
-sqlite = "3.46.1.3"
-pioneer = "2.2.0"
-haproxy = "4.1.97.Final"
-rewriter = "0.0.3"
-srgutils = "1.0.9"
-sparkapi = "0.1-20240720.200737-2"
-sparknt = "1.10.105-SNAPSHOT"
-velocity = "3.3.0-SNAPSHOT"
-disruptor = "3.4.4"
-simpleyaml = "1.8.4"
-classgraph = "4.8.47"
-mapping-io = "0.5.0"
-configurate = "4.2.0-SNAPSHOT"
-
-[libraries]
-art = { group = "net.neoforged", name = "AutoRenamingTool", version.ref = "art" }
-tca = { group = "net.minecrell", name = "terminalconsoleappender", version.ref="tca" }
-ansi = { group = "net.kyori", name = "ansi", version.ref = "ansi" }
-upnp = { group = "dev.omega24", name = "upnp4j", version.ref = "upnp" }
-mysql = { group = "com.mysql", name = "mysql-connector-j", version.ref = "mysql" }
-jansi = { group = "org.jline", name = "jline-terminal-jansi", version.ref = "jansi" }
-flare = { group = "com.github.technove", name = "flare", version.ref = "flare" }
-sqlite = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite" }
-pioneer = { group = "org.junit-pioneer", name = "junit-pioneer", version.ref = "pioneer" }
-haproxy = { group = "io.netty", name = "netty-codec-haproxy", version.ref = "haproxy" }
-srgutils = { group = "net.neoforged", name = "srgutils", version.ref = "srgutils" }
-velocity = { group = "com.velocitypowered", name = "velocity-native", version.ref = "velocity" }
-disruptor = { group = "com.lmax", name = "disruptor", version.ref = "disruptor" }
-mappingio = { group = "net.fabricmc", name = "mapping-io", version.ref = "mapping-io" }
-classgraph = { group = "io.github.classgraph", name = "classgraph", version.ref = "classgraph" }
-simpleyaml = { group = "com.github.carleslc.Simple-YAML", name = "Simple-Yaml", version.ref = "simpleyaml" }
-configurate = { group = "org.spongepowered", name = "configurate-yaml", version.ref = "configurate" }
-
-spark-api = { group = "me.lucko", name = "spark-api", version.ref = "sparkapi" }
-spark-paper = { group = "me.lucko", name = "spark-paper", version.ref = "sparknt" }
-
-rhino-engine = { group = "org.mozilla", name = "rhino-engine", version.ref = "rhino" }
-rhino-runtime = { group = "org.mozilla", name = "rhino-runtime", version.ref = "rhino" }
-
-rewriter = { group = "io.papermc", name = "reflection-rewriter", version.ref = "rewriter" }
-rewriter-runtime = { group = "io.papermc", name = "reflection-rewriter-runtime", version.ref = "rewriter" }
-rewriter-generator = { group = "io.papermc", name = "reflection-rewriter-proxy-generator", version.ref = "rewriter" }
-
-[bundles]
-runtime = [ "sqlite", "mysql", "disruptor" ]
-implementation = [ "spark-api", "spark-paper", "jansi", "tca", "ansi", "upnp", "haproxy", "configurate", "mappingio", "rhino-engine", "rhino-runtime", "srgutils", "art", "rewriter", "rewriter-runtime", "rewriter-generator", "flare" ]
-test = [ "classgraph", "pioneer" ]

patches/api/0002-Use-Gradle-Version-Catalogs.patch

@@ -1,150 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 14 Jan 2024 19:50:29 +0900
-Subject: [PATCH] Use Gradle Version Catalogs
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index b0fd6c1804844f09428051952e3ac4e58f8c859c..51a3639e5d1c3fec24af53f1e829532adeb6a1fa 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -9,11 +9,13 @@ java {
-     withJavadocJar()
- }
- 
-+/* // Plazma - Use Gradle Versuib Catalogs
- val annotationsVersion = "24.1.0"
- val bungeeCordChatVersion = "1.20-R0.2"
- val adventureVersion = "4.17.0"
- val slf4jVersion = "2.0.9"
- val log4jVersion = "2.17.1"
-+ */
- val apiAndDocs: Configuration by configurations.creating {
-     attributes {
-         attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
-@@ -39,57 +41,29 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
- // Paper end - configure mockito agent that is needed in newer java versions
- 
- dependencies {
--    api("com.mojang:brigadier:1.2.9") // Paper - Brigadier command api
--    // api dependencies are listed transitively to API consumers
--    api("com.google.guava:guava:32.1.2-jre")
--    api("com.google.code.gson:gson:2.10.1")
--    // Paper start - adventure
--    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.18") {
--        exclude("com.google.guava", "guava")
--    }
--    // Paper - adventure
--    api("org.yaml:snakeyaml:2.2")
--    api("org.joml:joml:1.10.5")
--    // Paper start
--    api("com.googlecode.json-simple:json-simple:1.1.1") {
--        isTransitive = false // includes junit
--    }
--    api("it.unimi.dsi:fastutil:8.5.6")
--    apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
--    apiAndDocs("net.kyori:adventure-api")
--    apiAndDocs("net.kyori:adventure-text-minimessage")
--    apiAndDocs("net.kyori:adventure-text-serializer-gson")
--    apiAndDocs("net.kyori:adventure-text-serializer-legacy")
--    apiAndDocs("net.kyori:adventure-text-serializer-plain")
--    apiAndDocs("net.kyori:adventure-text-logger-slf4j")
--    api("org.apache.logging.log4j:log4j-api:$log4jVersion")
--    api("org.slf4j:slf4j-api:$slf4jVersion")
--    api("io.sentry:sentry:5.4.0") // Pufferfish
--
--    implementation("org.ow2.asm:asm:9.7.1")
--    implementation("org.ow2.asm:asm-commons:9.7.1")
--    // Paper end
--
--    api("org.apache.maven:maven-resolver-provider:3.9.6") // Paper - make API dependency for Paper Plugins
--    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
--    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
--
--    val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations...
--    compileOnly(annotations)
--    testCompileOnly(annotations)
--
--    // Paper start - add checker
--    val checkerQual = "org.checkerframework:checker-qual:3.33.0"
--    compileOnlyApi(checkerQual)
--    testCompileOnly(checkerQual)
--    // Paper end
--    api("org.jspecify:jspecify:1.0.0") // Paper - add jspecify
--
--    testImplementation("org.apache.commons:commons-lang3:3.12.0")
--    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
--    testImplementation("org.hamcrest:hamcrest:2.2")
--    testImplementation("org.mockito:mockito-core:5.14.1")
--    testImplementation("org.ow2.asm:asm-tree:9.7.1")
-+    // Plazma start - Use Gradle Version Catalogs
-+    implementation(common.bundles.asm)
-+
-+    api(api.bundles.api)
-+    api(common.snakeyaml)
-+    api(common.log4j.api)
-+    api(common.maven.provider)
-+    api(api.jsonsimple) { isTransitive = false }
-+    api(api.bungeechat) { exclude("com.google.guava", "guava") }
-+    apiAndDocs(platform(common.adventure.bom))
-+    apiAndDocs(common.bundles.adventure)
-+
-+    compileOnly(common.bundles.maven)
-+    compileOnly(api.annotations)
-+    compileOnlyApi(api.checkerqual)
-+
-+    testImplementation(common.asm.tree)
-+    testImplementation(common.commons.lang3)
-+    testImplementation(common.bundles.test)
-+
-+    testCompileOnly(api.annotations)
-+    testCompileOnly(api.checkerqual)
-+    // Plazma end
-     mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // Paper - configure mockito agent that is needed in newer java versions
- }
- 
-@@ -175,27 +149,24 @@ tasks.withType<Javadoc> {
-     options.use()
-     options.isDocFilesSubDirs = true
-     options.links(
--        "https://guava.dev/releases/32.1.2-jre/api/docs/",
--        "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
--        "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
--        // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat
--        // Paper start - add missing javadoc links
--        "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html",
--        "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
-         "https://jspecify.dev/docs/api/",
--        // Paper end
--        // Paper start
--        "https://jd.advntr.dev/api/$adventureVersion/",
--        "https://jd.advntr.dev/key/$adventureVersion/",
--        "https://jd.advntr.dev/text-minimessage/$adventureVersion/",
--        "https://jd.advntr.dev/text-serializer-gson/$adventureVersion/",
--        "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
--        "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
--        "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
--        "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
--        "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/",
--        // Paper end
--        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3", // Paper
-+        // Plazma start - Use Gradle Version Catalogs
-+        "https://jd.advntr.dev/api/${common.adventure.api.orNull?.version}/",
-+        "https://jd.advntr.dev/key/${common.adventure.api.orNull?.version}/",
-+        "https://jd.advntr.dev/text-minimessage/${common.adventure.api.orNull?.version}/",
-+        "https://jd.advntr.dev/text-serializer-gson/${common.adventure.api.orNull?.version}/",
-+        "https://jd.advntr.dev/text-serializer-legacy/${common.adventure.api.orNull?.version}/",
-+        "https://jd.advntr.dev/text-serializer-plain/${common.adventure.api.orNull?.version}/",
-+        "https://jd.advntr.dev/text-logger-slf4j/${common.adventure.api.orNull?.version}/",
-+        "https://guava.dev/releases/${api.guava.orNull?.version}/api/docs/",
-+        "https://javadoc.io/doc/org.yaml/snakeyaml/${common.snakeyaml.orNull?.version}/",
-+        "https://javadoc.io/doc/org.jetbrains/annotations/${api.annotations.orNull?.version}/",
-+        "https://javadoc.io/doc/org.joml/joml/${api.joml.orNull?.version}/index.html",
-+        "https://www.javadoc.io/doc/com.google.code.gson/gson/${api.gson.orNull?.version}",
-+        "https://javadoc.io/doc/org.slf4j/slf4j-api/${api.slf4j.api.orNull?.version}/",
-+        "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/${common.log4j.api.orNull?.version}/",
-+        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/${common.maven.connector.orNull?.version}",
-+        // Plazma end
-     )
-     options.tags("apiNote:a:API Note:")
- 

patches/api/0003-Fork-friendly-Rebranding.patch

@@ -1,93 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Tue, 14 May 2024 18:36:30 +0900
-Subject: [PATCH] Fork-friendly Rebranding
-
-
-diff --git a/src/main/java/co/aikar/timings/TimingHandler.java b/src/main/java/co/aikar/timings/TimingHandler.java
-index 199789d56d22fcb1b77ebd56805cc28aa5a5ab0a..41d10421e1e79711e2e90ff2dc225bfd9cac9284 100644
---- a/src/main/java/co/aikar/timings/TimingHandler.java
-+++ b/src/main/java/co/aikar/timings/TimingHandler.java
-@@ -127,7 +127,7 @@ class TimingHandler implements Timing {
-         while ((last = TIMING_STACK.removeLast()) != this) {
-             last.timingDepth = 0;
-             if ("Minecraft".equalsIgnoreCase(last.identifier.group)) {
--                Logger.getGlobal().log(Level.SEVERE, "TIMING_STACK_CORRUPTION - Look above this for any errors and report this to Paper unless it has a plugin in the stack trace (" + last.identifier + " did not stopTiming)");
-+                Logger.getGlobal().log(Level.SEVERE, "TIMING_STACK_CORRUPTION - Look above this for any errors and report this to " + io.papermc.paper.ServerBuildInfo.buildInfo().brandName() + " unless it has a plugin in the stack trace (" + last.identifier + " did not stopTiming)"); // Plazma - Fork-friendly Rebranding
-             } else {
-                 Logger.getGlobal().log(Level.SEVERE, "TIMING_STACK_CORRUPTION - Report this to the plugin " + last.identifier.group + " (Look for errors above this in the logs) (" + last.identifier + " did not stopTiming)", new Throwable());
-             }
-diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-index 7196594e07af19a14c320d77df893978525fe386..6ac3376f12df2ee3e0519ab8b5a0c8211350e550 100644
---- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
-+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-@@ -33,6 +33,29 @@ public interface ServerBuildInfo {
-     Key BRAND_PURPUR_ID = Key.key("purpurmc", "purpur");
-     // Purpur end
- 
-+    // Plazma start - Fork-friendly Rebranding
-+    /**
-+     * The brand id for Plazma.
-+     */
-+    Key BRAND_PLAZMA_ID = Key.key("plazmamc", "plazma");
-+
-+    // For those who fork Plazma - please add the new branding key here
-+
-+    /**
-+     * The brand id of the server.
-+     */
-+    Key BRAND_ID = BRAND_PLAZMA_ID;
-+
-+    /**
-+     * Supported brands of the server.
-+     */
-+    java.util.List<Key> SUPPORTED_BRANDS = java.util.Arrays.asList(
-+        BRAND_PAPER_ID,
-+        BRAND_PURPUR_ID,
-+        BRAND_PLAZMA_ID
-+    );
-+    // Plazma end - Fork-friendly Rebranding
-+
-     /**
-      * Gets the {@code ServerBuildInfo}.
-      *
-diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index c880d0010849ab733ad13bbd18fab3c864d0cf61..316317222a137c2781b9b0c38948912e9dd08c76 100644
---- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -259,7 +259,7 @@ public class VersionCommand extends BukkitCommand {
-         // Purpur start
-         int distance = getVersionFetcher().distance();
-         final Component message = Component.join(net.kyori.adventure.text.JoinConfiguration.separator(Component.newline()),
--            ChatColor.parseMM("<grey>Current Purpur Version: %s%s*", distance == 0 ? "<green>" : distance > 0 ? "<yellow>" : "<red>", Bukkit.getVersion()),
-+            ChatColor.parseMM("<grey>Current " + io.papermc.paper.ServerBuildInfo.buildInfo().brandName() + " Version: %s%s*", distance == 0 ? "<green>" : distance > 0 ? "<yellow>" : "<red>", Bukkit.getVersion()), // Plazma - Fork-friendly Rebranding
-             // Purpur end
-             msg
-         );
-@@ -282,6 +282,7 @@ public class VersionCommand extends BukkitCommand {
-         }
-     }
- 
-+    /* // Plazma - Fork-friendly Rebranding
-     private static int getDistance(@NotNull String repo, @NotNull String hash) {
-         try {
-             BufferedReader reader = Resources.asCharSource(
-@@ -302,4 +303,5 @@ public class VersionCommand extends BukkitCommand {
-             return -1;
-         }
-     }
-+     */ // Plazma - Fork-friendly Rebranding
- }
-diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java
-index 60e086be70529e0804280b24a2a3e7ae72d8d363..dcf1d53af919e94a6947bc3f81121bd4fad1a163 100644
---- a/src/main/java/org/bukkit/plugin/EventExecutor.java
-+++ b/src/main/java/org/bukkit/plugin/EventExecutor.java
-@@ -54,7 +54,7 @@ public interface EventExecutor {
-         if (m.getReturnType() != Void.TYPE) {
-             final org.bukkit.plugin.java.JavaPlugin plugin = org.bukkit.plugin.java.JavaPlugin.getProvidingPlugin(m.getDeclaringClass());
-             org.bukkit.Bukkit.getLogger().warning("@EventHandler method " + m.getDeclaringClass().getName() + (Modifier.isStatic(m.getModifiers()) ? '.' : '#') + m.getName()
--                + " returns non-void type " + m.getReturnType().getName() + ". This is unsupported behavior and will no longer work in a future version of Paper."
-+                + " returns non-void type " + m.getReturnType().getName() + ". This is unsupported behavior and will no longer work in a future version of " + io.papermc.paper.ServerBuildInfo.buildInfo().brandName() + "." // Plazma - Fork-friendly Rebranding
-                 + " This should be reported to the developers of " + plugin.getPluginMeta().getDisplayName() + " (" + String.join(",", plugin.getPluginMeta().getAuthors()) + ')');
-         }
-         if (Modifier.isStatic(m.getModifiers())) {

patches/api/0004-Plazma-Configurations.patch

@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <alphakr93@outlook.com>
-Date: Thu, 22 Dec 2022 20:20:03 +0900
-Subject: [PATCH] Plazma Configurations
-
-
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ddb1ff894910761a78b91a343f32e129f03a03c4..bebe4116e50f0b0f64f6bdbd3f05f0b998225435 100644
---- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -2295,6 +2295,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-         }
-         // Purpur end
- 
-+        // Plazma start - Plazma Configuration API
-+        @NotNull
-+        public org.bukkit.configuration.file.YamlConfiguration getPlazmaConfig() {
-+            throw new UnsupportedOperationException("Not supported yet.");
-+        }
-+        // Plazma end
-+
-         /**
-          * Sends the component to the player
-          *

patches/api/0005-Various-API-Tweaks.patch

@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Mon, 6 May 2024 20:43:37 +0900
-Subject: [PATCH] Various API Tweaks
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java
-index 41eaa8159f8c028faa118300e95f6a0fb9cfe989..76a5381a959ae4e153dba291a362f3d58aeceac9 100644
---- a/src/main/java/com/destroystokyo/paper/MaterialTags.java
-+++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java
-@@ -584,6 +584,15 @@ public class MaterialTags {
-         .add(material -> material.name().startsWith("DEEPSLATE_") && material.name().endsWith("_ORE"))
-         .ensureSize("DEEPSLATE_ORES", 8).lock();
- 
-+    // Plazma start - Various API Tweaks
-+    /**
-+     * Covers the variants of stone ores.
-+     */
-+    public static final MaterialSetTag STONE_ORES = new MaterialSetTag(keyFor("stone_ores"))
-+        .add(material -> !material.name().startsWith("DEEPSLATE_") && !material.name().startsWith("NETHER_") && material.name().endsWith("_ORE"))
-+        .ensureSize("STONE_ORES", 8).lock();
-+    // Plazma end - Various API Tweaks
-+
-     /**
-      * Covers the variants of raw ore blocks.
-      */

patches/api/0008-Add-option-to-shoot-fireball.patch

@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Sat, 14 Dec 2024 12:25:43 +0900
+Subject: [PATCH] Add option to shoot fireball
+
+
+diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
+index 361db256296d776c27e601c923b2cdc61967122b..8a740bdd99b683255fdd7ebf81f28ceca8b030f8 100644
+--- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
++++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
+@@ -224,6 +224,12 @@ public class CreatureSpawnEvent extends EntitySpawnEvent {
+         /**
+          * When an entity is missing a SpawnReason
+          */
+-        DEFAULT
++        DEFAULT,
++        // Plazma start - Option to shoot fireballs
++        /*
++         * When a player shoots a fire charge
++         */
++        FIRE_CHARGE,
++        // Plazma end - Option to shoot fireballs
+     }
+ }

patches/api/feature/0007-Reduce-allocations.patch

@@ -27,7 +27,7 @@ index c89d6c4c38e2390cb11ffba182f8741d3726cfd1..2451f466ae6f953b01ad2cbaeac7d163
       * Executes the command with the given {@link CommandSourceStack} and arguments.
       *
 diff --git a/src/main/java/org/bukkit/Fluid.java b/src/main/java/org/bukkit/Fluid.java
-index a3ff4fefaf50f3e99a69ba68cbe8e30c95dac5df..284b351e3628bf278afb43cc6f6bdf1e6b295366 100644
+index a3ff4fefaf50f3e99a69ba68cbe8e30c95dac5df..5bbecd907e222f9adcf726bccab63c9ef59f5c14 100644
 --- a/src/main/java/org/bukkit/Fluid.java
 +++ b/src/main/java/org/bukkit/Fluid.java
 @@ -10,6 +10,7 @@ import org.jetbrains.annotations.NotNull;
@@ -47,7 +47,7 @@ index a3ff4fefaf50f3e99a69ba68cbe8e30c95dac5df..284b351e3628bf278afb43cc6f6bdf1e
      }
  }
 diff --git a/src/main/java/org/bukkit/attribute/Attribute.java b/src/main/java/org/bukkit/attribute/Attribute.java
-index 521f035409ee61a9ad73d39bec938f2938892570..4ca383b167326a2ccc21b2435eb96ff41c49cc31 100644
+index 521f035409ee61a9ad73d39bec938f2938892570..6e53135579426cb677bf34a0813db8268d550428 100644
 --- a/src/main/java/org/bukkit/attribute/Attribute.java
 +++ b/src/main/java/org/bukkit/attribute/Attribute.java
 @@ -15,6 +15,7 @@ import org.jetbrains.annotations.NotNull;
@@ -67,10 +67,10 @@ index 521f035409ee61a9ad73d39bec938f2938892570..4ca383b167326a2ccc21b2435eb96ff4
      }
  }
 diff --git a/src/main/java/org/bukkit/block/Biome.java b/src/main/java/org/bukkit/block/Biome.java
-index 464f8f81ba907a61588e4ab869e4f8269830195a..c5f1cc1660c69dfd827344cbafee08005121fb62 100644
+index 20fc2b30fdcdedb012dfe129e746d0b9e162fc36..ca97debfd1a204d15bf5f6c176612cccc2596537 100644
 --- a/src/main/java/org/bukkit/block/Biome.java
 +++ b/src/main/java/org/bukkit/block/Biome.java
-@@ -23,6 +23,7 @@ import org.jetbrains.annotations.NotNull;
+@@ -21,6 +21,7 @@ import org.jetbrains.annotations.NotNull;
   * which can be accessed via {@link Registry#BIOME}.
   */
  public interface Biome extends OldEnum<Biome>, Keyed, net.kyori.adventure.translation.Translatable { // Paper - Adventure translations
@@ -78,7 +78,7 @@ index 464f8f81ba907a61588e4ab869e4f8269830195a..c5f1cc1660c69dfd827344cbafee0800
  
      Biome OCEAN = getBiome("ocean");
      Biome PLAINS = getBiome("plains");
-@@ -129,7 +130,7 @@ public interface Biome extends OldEnum<Biome>, Keyed, net.kyori.adventure.transl
+@@ -125,7 +126,7 @@ public interface Biome extends OldEnum<Biome>, Keyed, net.kyori.adventure.transl
      @NotNull
      @Deprecated(since = "1.21.3", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils
      static Biome[] values() {
@@ -88,7 +88,7 @@ index 464f8f81ba907a61588e4ab869e4f8269830195a..c5f1cc1660c69dfd827344cbafee0800
  
      // Paper start
 diff --git a/src/main/java/org/bukkit/block/banner/PatternType.java b/src/main/java/org/bukkit/block/banner/PatternType.java
-index 70904d6c43b93cb7b9d74d20666fac93a6b4996c..ce88fc3594a6b5e85009707e1319f7f87524dd5f 100644
+index 24b58ed80f3dd7c6b35bb18071000af845d18ba4..13ad0ba6320acd054a665d1749871a14cfd1a520 100644
 --- a/src/main/java/org/bukkit/block/banner/PatternType.java
 +++ b/src/main/java/org/bukkit/block/banner/PatternType.java
 @@ -12,6 +12,8 @@ import org.jetbrains.annotations.NotNull;
@@ -100,7 +100,7 @@ index 70904d6c43b93cb7b9d74d20666fac93a6b4996c..ce88fc3594a6b5e85009707e1319f7f8
      PatternType BASE = getType("base");
      PatternType SQUARE_BOTTOM_LEFT = getType("square_bottom_left");
      PatternType SQUARE_BOTTOM_RIGHT = getType("square_bottom_right");
-@@ -130,6 +132,6 @@ public interface PatternType extends OldEnum<PatternType>, Keyed {
+@@ -140,6 +142,6 @@ public interface PatternType extends OldEnum<PatternType>, Keyed {
      @NotNull
      @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils
      static PatternType[] values() {
@@ -109,7 +109,7 @@ index 70904d6c43b93cb7b9d74d20666fac93a6b4996c..ce88fc3594a6b5e85009707e1319f7f8
      }
  }
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 0a26fffe9b1e5080b5639767a03af11006108b4a..bcd12e352d8846826a678ff72742fc7038daf812 100644
+index 74384a56eebbce41d431db2507c55eddbcf50a41..ef3afe91312de1d0fb38d985e0421ceae59d7e57 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -58,6 +58,19 @@ public abstract class Command {
@@ -133,7 +133,7 @@ index 0a26fffe9b1e5080b5639767a03af11006108b4a..bcd12e352d8846826a678ff72742fc70
       * Executes the command, returning its success
       *
 diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java
-index 43e306584988e39a6daca78c621a937acdce48a1..ec6dc4747c8bcdca1cf866ba135fb772e79a73d1 100644
+index a824ac90e78d3d7f90b01397270e54422d88e8b9..95df10ad8a53942de435cec7db57c1bb496097dc 100644
 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java
 +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java
 @@ -15,6 +15,8 @@ import org.jetbrains.annotations.Nullable;
@@ -147,14 +147,14 @@ index 43e306584988e39a6daca78c621a937acdce48a1..ec6dc4747c8bcdca1cf866ba135fb772
       */
 @@ -536,6 +538,6 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve
      @NotNull
-     @Deprecated
+     @Deprecated(since = "1.20.3")
      public static Enchantment[] values() {
 -        return Lists.newArrayList(Registry.ENCHANTMENT).toArray(new Enchantment[0]);
 +        return Lists.newArrayList(Registry.ENCHANTMENT).toArray(EMPTY_ARRAY); // Plazma - Reduce allocations
      }
  }
 diff --git a/src/main/java/org/bukkit/entity/Cat.java b/src/main/java/org/bukkit/entity/Cat.java
-index fca4671c6976aee9e981ef344244f9322651d0c9..ef53ca228492434b1b8bc615a33690bb93dec72b 100644
+index fca4671c6976aee9e981ef344244f9322651d0c9..7dc1744fba576683155e7970832794c05ceff768 100644
 --- a/src/main/java/org/bukkit/entity/Cat.java
 +++ b/src/main/java/org/bukkit/entity/Cat.java
 @@ -51,6 +51,7 @@ public interface Cat extends Tameable, Sittable, io.papermc.paper.entity.CollarC
@@ -175,7 +175,7 @@ index fca4671c6976aee9e981ef344244f9322651d0c9..ef53ca228492434b1b8bc615a33690bb
      }
  
 diff --git a/src/main/java/org/bukkit/entity/Frog.java b/src/main/java/org/bukkit/entity/Frog.java
-index f661a6b4797dd814a197e9245bcb2ddf2fca773f..6b3c10d378e9e80805d8cd2d8671b313bddd23e9 100644
+index f661a6b4797dd814a197e9245bcb2ddf2fca773f..58bf414cd753299abc54c45b3036d3fdbf9170dc 100644
 --- a/src/main/java/org/bukkit/entity/Frog.java
 +++ b/src/main/java/org/bukkit/entity/Frog.java
 @@ -49,6 +49,7 @@ public interface Frog extends Animals {
@@ -196,7 +196,7 @@ index f661a6b4797dd814a197e9245bcb2ddf2fca773f..6b3c10d378e9e80805d8cd2d8671b313
      }
  }
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index 9c722a762c88a88bb5ef18c3b9eab8b371360dac..87c3e94a2b5e9205a9ad13a920ed7b9dfba03340 100644
+index 9c722a762c88a88bb5ef18c3b9eab8b371360dac..127bc2aab7fb36df206d53f3e6042bb6c920878e 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
 @@ -170,6 +170,7 @@ public interface Villager extends AbstractVillager {
@@ -234,7 +234,7 @@ index 9c722a762c88a88bb5ef18c3b9eab8b371360dac..87c3e94a2b5e9205a9ad13a920ed7b9d
  
          // Paper start
 diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java
-index eb73f3224e7d2314c4209a3743a37bdae2395670..1b660fd1334847d8f8cd7eeff3d5ebd085fdfcfd 100644
+index 7f5682c80ff25142e7c8fa14e03b4a62fc5c01d3..5fbcdf637b1e0162276e668d9ebe4a8648a29b8a 100644
 --- a/src/main/java/org/bukkit/map/MapCursor.java
 +++ b/src/main/java/org/bukkit/map/MapCursor.java
 @@ -286,6 +286,7 @@ public final class MapCursor {
@@ -255,7 +255,7 @@ index eb73f3224e7d2314c4209a3743a37bdae2395670..1b660fd1334847d8f8cd7eeff3d5ebd0
      }
  
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 11b973b70ce62a6e227d343bdef6dcb9ece3f97d..ccb4245b214444153cbca487ca98cb2ad65ccbae 100644
+index 2f8d3b7a5b25e323f892d2ec5eb7c3412a816ea4..22e358f7a83d84745c32ff9f04d79d51d8d92131 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -47,6 +47,7 @@ import org.jetbrains.annotations.Nullable;
@@ -276,7 +276,7 @@ index 11b973b70ce62a6e227d343bdef6dcb9ece3f97d..ccb4245b214444153cbca487ca98cb2a
          Preconditions.checkArgument(directory != null, "Directory cannot be null");
          Preconditions.checkArgument(directory.isDirectory(), "Directory must be a directory");
 diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java
-index 294ba70f1e446ec8d502e5c14f82ae52547aeb21..beb22bb6ca719ef11814e7cc80cc1aef7cb6f0ec 100644
+index e4cfdc80c9e49fc7992183022bdf2f36aae0d95a..0cd7987e935e2b7ede759af3db9af04366930e19 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffectType.java
 +++ b/src/main/java/org/bukkit/potion/PotionEffectType.java
 @@ -19,6 +19,7 @@ import org.jetbrains.annotations.Nullable;
@@ -289,7 +289,7 @@ index 294ba70f1e446ec8d502e5c14f82ae52547aeb21..beb22bb6ca719ef11814e7cc80cc1aef
       * Increases movement speed.
 @@ -358,7 +359,7 @@ public abstract class PotionEffectType implements Keyed, Translatable, net.kyori
      @NotNull
-     @Deprecated
+     @Deprecated(since = "1.20.3")
      public static PotionEffectType[] values() {
 -        return Lists.newArrayList(Registry.EFFECT).toArray(new PotionEffectType[0]);
 +        return Lists.newArrayList(Registry.EFFECT).toArray(EMPTY_ARRAY); // Plazma - Reduce allocations

patches/api/feature/sparklypaper/0001-Add-ClientboundPacketPreDispatchEvent.patch

@@ -0,0 +1,91 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrPowerGamerBR <git@mrpowergamerbr.com>
+Date: Mon, 10 Jun 2024 12:27:08 -0300
+Subject: [PATCH] Add ClientboundPacketPreDispatchEvent
+
+
+diff --git a/src/main/java/net/sparklypower/sparklypaper/event/packet/ClientboundPacketPreDispatchEvent.java b/src/main/java/net/sparklypower/sparklypaper/event/packet/ClientboundPacketPreDispatchEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..9a279ad0b0f9b63f5f3a37977076e0bb805cd56d
+--- /dev/null
++++ b/src/main/java/net/sparklypower/sparklypaper/event/packet/ClientboundPacketPreDispatchEvent.java
+@@ -0,0 +1,79 @@
++package net.sparklypower.sparklypaper.event.packet;
++
++import org.bukkit.entity.Player;
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.Event;
++import org.bukkit.event.HandlerList;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
++
++/**
++ * Called before a packet is dispatched to a connection.
++ * <p>
++ * Compared to other solutions like ProtocolLib, this has the advantage that this is called eariler on the packet sending cycle, before the packet is added to the packet queue, allowing for
++ * main thread access of resources without worrying about race conditions.
++ * <p>
++ * The asynchronously state of this event is undefined, the event may be called on an async or on a sync thread, depending on where the packet was sent.
++ */
++public class ClientboundPacketPreDispatchEvent extends Event implements Cancellable {
++    private static final HandlerList handlers = new HandlerList();
++    private boolean isCancelled = false;
++    private final Player player;
++    private Object packet;
++
++    public ClientboundPacketPreDispatchEvent(boolean isAsync, @Nullable Player player, @NotNull Object packet) {
++        super(isAsync);
++        this.player = player;
++        this.packet = packet;
++    }
++
++    /**
++     * Gets the player associated with this packet.
++     * <p>
++     * Depending on which phase the packet is from, the player may be null
++     *
++     * @return the player associated with this packet
++     */
++    @Nullable
++    public Player getPlayer() {
++        return player;
++    }
++
++    /**
++     * Gets the packet associated with this event.
++     *
++     * @return the packet associated with this event
++     */
++    @NotNull
++    public Object getPacket() {
++        return packet;
++    }
++
++    /**
++     * Sets the packet associated with this event.
++     */
++    public void setPacket(@NotNull Object packet) {
++        this.packet = packet;
++    }
++
++    @NotNull
++    @Override
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    @NotNull
++    public static HandlerList getHandlerList() {
++        return handlers;
++    }
++
++    @Override
++    public boolean isCancelled() {
++        return isCancelled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancel) {
++        this.isCancelled = cancel;
++    }
++}

patches/api/feature/sparklypaper/0002-Add-PlayerBlockDestroySpeedEvent.patch

@@ -0,0 +1,76 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrPowerGamerBR <git@mrpowergamerbr.com>
+Date: Mon, 10 Jun 2024 14:38:59 -0300
+Subject: [PATCH] Add PlayerBlockDestroySpeedEvent
+
+
+diff --git a/src/main/java/net/sparklypower/sparklypaper/event/block/PlayerBlockDestroySpeedEvent.java b/src/main/java/net/sparklypower/sparklypaper/event/block/PlayerBlockDestroySpeedEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..d5e097dad04ed62088aade42ba59866029369326
+--- /dev/null
++++ b/src/main/java/net/sparklypower/sparklypaper/event/block/PlayerBlockDestroySpeedEvent.java
+@@ -0,0 +1,64 @@
++package net.sparklypower.sparklypaper.event.block;
++
++import org.bukkit.block.Block;
++import org.bukkit.entity.Player;
++import org.bukkit.event.Event;
++import org.bukkit.event.HandlerList;
++import org.bukkit.event.block.BlockEvent;
++import org.jetbrains.annotations.NotNull;
++
++/**
++ * Called when the block destroy speed is calculated for a block that a player is breaking.
++ * <p>
++ * Useful for custom blocks to override a server side block destroy speed to fix desynchronization issues between the server and the client. (Example: Chiseled bookshelves on the server side that are overriden by target blocks on the client side)
++ * <p>
++ * Keep in mind that you should use this event to synchronize the block destroy speed between the server and the client! Not keeping both destroy speeds in sync will cause desync issues!
++ */
++public class PlayerBlockDestroySpeedEvent extends BlockEvent {
++    private static final HandlerList handlers = new HandlerList();
++    private final Player player;
++    private float destroySpeed;
++
++    public PlayerBlockDestroySpeedEvent(@NotNull Player player, @NotNull Block block, float destroySpeed) {
++        super(block);
++        this.player = player;
++        this.destroySpeed = destroySpeed;
++    }
++
++    @NotNull
++    @Override
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    @NotNull
++    public static HandlerList getHandlerList() {
++        return handlers;
++    }
++
++    /**
++     * Gets the Player that is breaking the block involved in this event.
++     *
++     * @return The Player that is breaking the block involved in this event
++     */
++    @NotNull
++    public Player getPlayer() {
++        return player;
++    }
++
++    /**
++     * Gets the block destroy speed of the block involved in this event.
++     *
++     * @return the block destroy speed of the block involved in this event.
++     */
++    public float getDestroySpeed() {
++        return destroySpeed;
++    }
++
++    /**
++     * Sets the block destroy speed of the block involved in this event.
++     */
++    public void setDestroySpeed(float destroySpeed) {
++        this.destroySpeed = destroySpeed;
++    }
++}

patches/api/feature/sparklypaper/0003-Add-CraftItemRecipeEvent.patch

@@ -0,0 +1,83 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrPowerGamerBR <git@mrpowergamerbr.com>
+Date: Tue, 25 Jun 2024 02:54:47 -0300
+Subject: [PATCH] Add CraftItemRecipeEvent
+
+Used when a player OR a crafter block crafts an item, as an alternative to PrepareItemCraftEvent and CraftItemEvent, because both events are not triggered when a item is crafted from a crafter
+
+diff --git a/src/main/java/net/sparklypower/sparklypaper/event/inventory/CraftItemRecipeEvent.java b/src/main/java/net/sparklypower/sparklypaper/event/inventory/CraftItemRecipeEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..129e5244fd0928fc21d9aa7d4bc28e89c1408be0
+--- /dev/null
++++ b/src/main/java/net/sparklypower/sparklypaper/event/inventory/CraftItemRecipeEvent.java
+@@ -0,0 +1,70 @@
++package net.sparklypower.sparklypaper.event.inventory;
++
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.Event;
++import org.bukkit.event.HandlerList;
++import org.bukkit.inventory.*;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
++
++/**
++ * Called when the recipe of an Item is completed inside a crafting matrix.
++ *
++ * This is an alternate version of [org.bukkit.event.inventory.CraftItemEvent], where this one is called for player crafting items and crafters.
++ */
++public class CraftItemRecipeEvent extends Event implements Cancellable {
++    private static final HandlerList handlers = new HandlerList();
++    private final Recipe recipe;
++    private final ItemStack @Nullable [] matrix;
++    private ItemStack result;
++    private boolean isCancelled = false;
++
++    public CraftItemRecipeEvent(@NotNull ItemStack @Nullable [] matrix, @NotNull Recipe recipe, @Nullable ItemStack result) {
++        this.matrix = matrix;
++        this.recipe = recipe;
++        this.result = result;
++    }
++
++    public void setResult(@Nullable ItemStack result) {
++        this.result = result;
++    }
++
++    @Nullable
++    public ItemStack getResult() {
++        return result;
++    }
++
++    /**
++     * @return A copy of the current recipe on the crafting matrix.
++     */
++    @NotNull
++    public Recipe getRecipe() {
++        return recipe;
++    }
++
++    public @Nullable ItemStack[] getCraftingMatrix() {
++        return matrix;
++    }
++
++    @Override
++    public boolean isCancelled() {
++        return isCancelled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancel) {
++        this.isCancelled = cancel;
++    }
++
++    @NotNull
++    @Override
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    @NotNull
++    public static HandlerList getHandlerList() {
++        return handlers;
++    }
++}
++

patches/api/feature/sparklypaper/server/0017-Add-ClientboundPacketPreDispatchEvent.patch

@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrPowerGamerBR <git@mrpowergamerbr.com>
+Date: Mon, 10 Jun 2024 12:22:15 -0300
+Subject: [PATCH] Add ClientboundPacketPreDispatchEvent
+
+
+diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
+index 3e550f8e7cd4f4e16f499a8a2a4b95420270f07a..3bcff05a99662c28cc490579162a1f05b55b1cda 100644
+--- a/src/main/java/net/minecraft/network/Connection.java
++++ b/src/main/java/net/minecraft/network/Connection.java
+@@ -450,6 +450,18 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+             return;
+         }
+ 
++        // SparklyPaper start - Add ClientboundPacketPreDispatchEvent
++        net.minecraft.server.level.ServerPlayer serverPlayer = this.getPlayer();
++        org.bukkit.craftbukkit.entity.CraftPlayer craftPlayer = null;
++        if (serverPlayer != null)
++            craftPlayer = serverPlayer.getBukkitEntity();
++        net.sparklypower.sparklypaper.event.packet.ClientboundPacketPreDispatchEvent event = new net.sparklypower.sparklypaper.event.packet.ClientboundPacketPreDispatchEvent(!org.bukkit.Bukkit.isPrimaryThread(), craftPlayer, packet);
++        org.bukkit.Bukkit.getPluginManager().callEvent(event);
++        if (event.isCancelled())
++            return;
++        packet = (Packet<?>) event.getPacket();
++        // SparklyPaper end
++
+         packet.onPacketDispatch(this.getPlayer());
+         if (connected && (InnerUtil.canSendImmediate(this, packet)
+             || (io.papermc.paper.util.MCUtil.isMainThread() && packet.isReady() && this.pendingActions.isEmpty()

patches/api/feature/sparklypaper/server/0019-Add-PlayerBlockDestroySpeedEvent.patch

@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrPowerGamerBR <git@mrpowergamerbr.com>
+Date: Mon, 10 Jun 2024 14:39:10 -0300
+Subject: [PATCH] Add PlayerBlockDestroySpeedEvent
+
+
+diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
+index 99fd67a78539133adf78d65e2c520ff3dd260301..96640ae707c9babe1c4f4895f39d4d7cfc71a765 100644
+--- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
++++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
+@@ -336,6 +336,14 @@ public abstract class BlockBehaviour implements FeatureElement {
+     protected float getDestroyProgress(BlockState state, Player player, BlockGetter world, BlockPos pos) {
+         float f = state.getDestroySpeed(world, pos);
+ 
++        // SparklyPaper start - Add PlayerBlockDestroySpeedEvent
++        // *Technically* it seems that all getDestroyProgress calls use a LevelAccessor, but anyway...
++        if (world instanceof LevelAccessor) {
++            net.sparklypower.sparklypaper.event.block.PlayerBlockDestroySpeedEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerBlockDestroySpeedEvent(player, (LevelAccessor) world, pos, f);
++            f = event.getDestroySpeed();
++        }
++        // SparklyPaper end
++
+         if (f == -1.0F) {
+             return 0.0F;
+         } else {
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index e37aaf77f94b97b736cc20ef070cefdff0400188..a46f0c810ee2b9679c0530e5e6d3505b3d1f661c 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -2271,4 +2271,13 @@ public class CraftEventFactory {
+         return event;
+     }
+     // Paper end - add EntityFertilizeEggEvent
++
++    // SparklyPaper start - add PlayerBlockDestroySpeedEvent
++    public static net.sparklypower.sparklypaper.event.block.PlayerBlockDestroySpeedEvent callPlayerBlockDestroySpeedEvent(net.minecraft.world.entity.player.Player player, LevelAccessor world, BlockPos blockPos, float destroySpeed) {
++        org.bukkit.block.Block block = CraftBlock.at(world, blockPos);
++        net.sparklypower.sparklypaper.event.block.PlayerBlockDestroySpeedEvent event = new net.sparklypower.sparklypaper.event.block.PlayerBlockDestroySpeedEvent((Player) player.getBukkitEntity(), block, destroySpeed);
++        event.callEvent();
++        return event;
++    }
++    // SparklyPaper end
+ }

patches/api/feature/sparklypaper/server/0020-Add-CraftItemRecipeEvent.patch

@@ -0,0 +1,80 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrPowerGamerBR <git@mrpowergamerbr.com>
+Date: Tue, 25 Jun 2024 02:52:32 -0300
+Subject: [PATCH] Add CraftItemRecipeEvent
+
+Used when a player OR a crafter block crafts an item, as an alternative to PrepareItemCraftEvent and CraftItemEvent, because both events are not triggered when a item is crafted from a crafter
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index b5d5dbc50a7b8c40739a15f164ffd08fdc534f9c..01a67fde6c823cac52a6b09720f09acc825d3f86 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -3218,6 +3218,21 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+                                 } else {
+                                     event = new CraftItemEvent(recipe, inventory, type, packet.getSlotNum(), click, action);
+                                 }
++                                // SparklyPaper start - add CraftItemRecipeEvent
++                                // We will pigback a bit on the current implementation
++                                net.sparklypower.sparklypaper.event.inventory.CraftItemRecipeEvent craftItemRecipeEvent = new net.sparklypower.sparklypaper.event.inventory.CraftItemRecipeEvent(
++                                    ((CraftingInventory) top).getMatrix(), // We cannot use the top inventory directly because (it seems) that the first slot is the "result" slot
++                                    recipe,
++                                    event.getCurrentItem()
++                                );
++                                if (craftItemRecipeEvent.callEvent()) {
++                                    event.setCurrentItem(craftItemRecipeEvent.getResult());
++                                } else {
++                                    event.setCancelled(true);
++                                    cancelled = true;
++                                    event.setCurrentItem(craftItemRecipeEvent.getResult());
++                                }
++                                // SparklyPaper end
+                             }
+                         }
+ 
+diff --git a/src/main/java/net/minecraft/world/level/block/CrafterBlock.java b/src/main/java/net/minecraft/world/level/block/CrafterBlock.java
+index 0e609b1e3abd50b415d8376dc550375a8a0251b6..8dbac20e32b70879eeee1c3563948e36c2eae342 100644
+--- a/src/main/java/net/minecraft/world/level/block/CrafterBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/CrafterBlock.java
+@@ -203,6 +203,13 @@ public class CrafterBlock extends BaseEntityBlock {
+                 }
+                 itemstack = CraftItemStack.asNMSCopy(event.getResult());
+                 // CraftBukkit end
++                // SparklyPaper - add CraftItemRecipeEvent
++                net.sparklypower.sparklypaper.event.inventory.CraftItemRecipeEvent sparklyEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callCraftItemRecipeEvent(crafterblockentity, recipeholder.toBukkitRecipe(), itemstack);
++                if (sparklyEvent.isCancelled()) {
++                    return;
++                }
++                itemstack = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(sparklyEvent.getResult());
++                // SparklyPaper end
+                 if (itemstack.isEmpty()) {
+                     world.levelEvent(1050, pos, 0);
+                 } else {
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index a46f0c810ee2b9679c0530e5e6d3505b3d1f661c..85926a55066ac793b2e4cfe3502f9ab201df91a3 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -1471,6 +1471,24 @@ public class CraftEventFactory {
+         Bukkit.getPluginManager().callEvent(crafterCraftEvent);
+         return crafterCraftEvent;
+     }
++
++    // SparklyPaper start - add CraftItemRecipeEvent
++    public static net.sparklypower.sparklypaper.event.inventory.CraftItemRecipeEvent callCraftItemRecipeEvent(net.minecraft.world.inventory.CraftingContainer container, Recipe recipe, ItemStack result) {
++        org.bukkit.inventory.ItemStack[] matrix = new org.bukkit.inventory.ItemStack[container.getItems().size()];
++        int i = 0;
++        for (ItemStack item : container.getItems()) {
++            matrix[i] = CraftItemStack.asCraftMirror(item);
++            i++;
++        }
++        org.bukkit.inventory.ItemStack bukkitResult = CraftItemStack.asCraftMirror(result);
++
++        net.sparklypower.sparklypaper.event.inventory.CraftItemRecipeEvent event = new net.sparklypower.sparklypaper.event.inventory.CraftItemRecipeEvent(matrix, recipe, bukkitResult);
++        Bukkit.getPluginManager().callEvent(event);
++
++        return event;
++    }
++    // SparklyPaper end
++
+     // Paper start
+     @Deprecated
+     public static com.destroystokyo.paper.event.entity.ProjectileCollideEvent callProjectileCollideEvent(Entity entity, EntityHitResult position) {

patches/generated-api/0001-Purpur-Generated-API-Changes.patch

@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: granny <contact@granny.dev>
-Date: Thu, 18 Jan 2024 21:01:12 +0900
-Subject: [PATCH] Purpur Generated API Changes
-
-PurpurMC
-Copyright (C) 2024 PurpurMC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 35dfd25f21ca67b7f4d69326500980f4a021ef49..a9816fbfa466b3fe3f82c19aeeeb564c660e4b6a 100644
---- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-+++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -441,6 +441,18 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
- 
-     GoalKey<Zombie> ZOMBIE_ATTACK_TURTLE_EGG = create("zombie_attack_turtle_egg", Zombie.class);
- 
-+    // Purpur start
-+    GoalKey<Mob> MOB_HAS_RIDER = GoalKey.of(Mob.class, NamespacedKey.minecraft("has_rider"));
-+    GoalKey<AbstractHorse> HORSE_HAS_RIDER = GoalKey.of(AbstractHorse.class, NamespacedKey.minecraft("horse_has_rider"));
-+    GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
-+    GoalKey<Phantom> FIND_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("find_crystal"));
-+    GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
-+    GoalKey<Drowned> DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager"));
-+    GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
-+    GoalKey<Wolf> AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf"));
-+    GoalKey<IronGolem> RECEIVE_FLOWER = GoalKey.of(IronGolem.class, NamespacedKey.minecraft("receive_flower"));
-+    // Purpur end
-+
-     private static <T extends Mob> GoalKey<T> create(final String key, final Class<T> type) {
-         return GoalKey.of(type, NamespacedKey.minecraft(key));
-     }

patches/server/0002-mc-dev-fixes.patch

@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sat, 2 Nov 2024 15:26:27 +0900
-Subject: [PATCH] mc dev fixes
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/AllayAi.java b/src/main/java/net/minecraft/world/entity/animal/allay/AllayAi.java
-index 3fc1ec01e1a77a169ec762a23f15b97f040ce5f8..b5464708c1fa949e7df8aed71126ccad72d66ee3 100644
---- a/src/main/java/net/minecraft/world/entity/animal/allay/AllayAi.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/allay/AllayAi.java
-@@ -62,8 +62,8 @@ public class AllayAi {
-             Activity.CORE,
-             0,
-             ImmutableList.of(
--                new Swim<>(0.8F),
--                new AnimalPanic(2.5F),
-+                new Swim<Allay>(0.8F), // Plazma - mc dev fixes
-+                new AnimalPanic<Allay>(2.5F), // Plazma - mc dev fixes
-                 new LookAtTargetSink(45, 90),
-                 new MoveToTargetSink(),
-                 new CountDownCooldownTicks(MemoryModuleType.LIKED_NOTEBLOCK_COOLDOWN_TICKS),

patches/server/0003-Build-System-Changes.patch

@@ -1,118 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 14 Jan 2024 19:51:19 +0900
-Subject: [PATCH] Build System Changes
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index b4579fb919d8cc981edc4863b82abca531349f1e..6734821658e7679f328336038587390a262f2b64 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -25,64 +25,30 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
- // Paper end - configure mockito agent that is needed in newer java versions
- 
- dependencies {
--    implementation(project(":purpur-api")) // Pufferfish // Paper // Purpur
--    // 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.
--     */
--    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)
--    implementation("io.netty:netty-codec-haproxy:4.1.97.Final") // Paper - Add support for proxy protocol
--    // Paper end
--    implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion
--    implementation("org.ow2.asm:asm-commons:9.7.1")
--    implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
--    implementation("commons-lang:commons-lang:2.6")
--    runtimeOnly("org.xerial:sqlite-jdbc:3.46.1.3")
--    runtimeOnly("com.mysql:mysql-connector-j:9.1.0")
--    runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
--    // Paper start - Use Velocity cipher
--    implementation("com.velocitypowered:velocity-native:3.3.0-SNAPSHOT") {
--        isTransitive = false
--    }
--    // Paper end - Use Velocity cipher
--
--    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")
--
--    implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
--    implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
--    implementation("dev.omega24:upnp4j:1.0") // Purpur
--
--    testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
--    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
--    testImplementation("org.junit.platform:junit-platform-suite-engine:1.10.0")
--    testImplementation("org.hamcrest:hamcrest:2.2")
--    testImplementation("org.mockito:mockito-core:5.14.1")
-+    // Plazma start - Build System Changes
-+    implementation(project(":${rootProject.providers.gradleProperty("brandName").get().lowercase()}-api"))
-+    implementation(common.snakeyaml)
-+    implementation(common.asm.commons)
-+    implementation(common.log4j.core)
-+    implementation(common.log4j.iostreams)
-+    implementation(common.commons.lang2)
-+    implementation(common.adventure.serializer.ansi)
-+    implementation(server.velocity) { isTransitive = false }
-+    implementation(server.simpleyaml) { exclude(group="org.yaml", module="snakeyaml") }
-+    implementation(server.bundles.implementation)
-+
-+    log4jPlugins.annotationProcessorConfigurationName(common.log4j.core)
-+    alsoShade(log4jPlugins.output) // diff on changes
-+    runtimeOnly(log4jPlugins.output) // diff on changes
-+
-+    runtimeOnly(common.maven.provider)
-+    runtimeOnly(common.bundles.maven)
-+    runtimeOnly(server.bundles.runtime)
-+
-+    testImplementation(common.bundles.test)
-+    testImplementation(server.bundles.test)
-+    // Plazma end - Build System Changes
-     mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // Paper - configure mockito agent that is needed in newer java versions
--    testImplementation("org.ow2.asm:asm-tree:9.7.1")
--    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.3"
--    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
--    // Paper start - spark
--    implementation("me.lucko:spark-api:0.1-20240720.200737-2")
--    implementation("me.lucko:spark-paper:1.10.105-SNAPSHOT")
--    // Paper end - spark
- }
- 
- paperweight {
-@@ -102,14 +68,14 @@ tasks.jar {
-         val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
-         attributes(
-             "Main-Class" to "org.bukkit.craftbukkit.Main",
--            "Implementation-Title" to "Purpur", // Pufferfish // Purpur
-+            "Implementation-Title" to rootProject.providers.gradleProperty("brandName").get(), // Pufferfish // Purpur // Plazma - Fork-friendly Rebranding
-             "Implementation-Version" to implementationVersion,
-             "Implementation-Vendor" to date, // Paper
--            "Specification-Title" to "Purpur", // Pufferfish // Purpur
-+            "Specification-Title" to rootProject.providers.gradleProperty("brandName").get(), // Pufferfish // Purpur // Plazma - Fork-friendly Rebranding
-             "Specification-Version" to project.version,
--            "Specification-Vendor" to "Purpur Team", // Pufferfish // Purpur
--            "Brand-Id" to "purpurmc:purpur", // Pufferfish // Purpur
--            "Brand-Name" to "Purpur", // Pufferfish // Purpur
-+            "Specification-Vendor" to rootProject.providers.gradleProperty("providerName").get(), // Purpur // Plazma - Fork-friendly Rebranding
-+            "Brand-Id" to rootProject.providers.gradleProperty("brandKey").get(), // Purpur // Plazma - Fork-friendly Rebranding
-+            "Brand-Name" to rootProject.providers.gradleProperty("brandName").get(), // Pufferfish // Purpur // Plazma - Fork-friendly Rebranding
-             "Build-Number" to (build ?: ""),
-             "Build-Time" to Instant.now().toString(),
-             "Git-Branch" to gitBranch, // Paper

patches/server/0004-Fork-friendly-Rebranding.patch

@@ -1,426 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 21 Dec 2022 19:31:24 +0900
-Subject: [PATCH] Fork-friendly Rebranding
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..8d5a52c5762c3d9b44dcdf00ae312e0bdc01fa1f 100644
---- a/src/main/java/com/destroystokyo/paper/Metrics.java
-+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
-@@ -593,7 +593,7 @@ public class Metrics {
-             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("Purpur", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur
-+                Metrics metrics = new Metrics(io.papermc.paper.ServerBrandConstants.BRAND_NAME, serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur // Plazma - Fork-friendly Rebranding
- 
-                 metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
-                     String minecraftVersion = Bukkit.getVersion();
-diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index 6d36fc6d8e22d9b68dea3830f6ecc8763184c343..6995627310de4911d87a2f93a723d6b93dc0612f 100644
---- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -36,7 +36,7 @@ public class PaperVersionFetcher implements VersionFetcher {
-     private static final int DISTANCE_ERROR = -1;
-     private static final int DISTANCE_UNKNOWN = -2;
-     // Purpur start
--    private static final String DOWNLOAD_PAGE = "https://purpurmc.org/downloads";
-+    // private static final String DOWNLOAD_PAGE = "https://purpurmc.org/downloads"; // Plazma - Fork-friendly Rebranding
-     private static int distance = DISTANCE_UNKNOWN; public int distance() { return distance; }
-     // Purpur end
- 
-@@ -52,7 +52,7 @@ public class PaperVersionFetcher implements VersionFetcher {
-         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("PurpurMC/Purpur", build); // Purpur
-+            updateMessage = getUpdateStatusMessage("PlazmaMC/Plazma", build); // Purpur // Plazma - Fork-friendly Rebranding
-         }
-         final @Nullable Component history = this.getHistory();
- 
-@@ -63,8 +63,12 @@ public class PaperVersionFetcher implements VersionFetcher {
-         //int distance = DISTANCE_ERROR; // Purpur - use field
- 
-         final OptionalInt buildNumber = build.buildNumber();
--        if (buildNumber.isPresent()) {
--            distance = fetchDistanceFromSiteApi(build, buildNumber.getAsInt());
-+        // Plazma start - TODO: CI Checking
-+        //noinspection PointlessBooleanExpression
-+        if (false && buildNumber.isPresent()) {
-+            throw new UnsupportedOperationException("Version fetching from CI is not supported yet");
-+            // distance = fetchDistanceFromSiteApi(build, buildNumber.getAsInt());
-+        // Plazma end - TODO: CI Checking
-         } else {
-             final Optional<String> gitBranch = build.gitBranch();
-             final Optional<String> gitCommit = build.gitCommit();
-@@ -80,12 +84,13 @@ public class PaperVersionFetcher implements VersionFetcher {
-             default -> text("* You are " + distance + " version(s) behind", NamedTextColor.YELLOW) // Purpur
-                 .append(Component.newline())
-                 .append(text("Download the new version at: ")
--                    .append(text(DOWNLOAD_PAGE, NamedTextColor.GOLD)
-+                    .append(text(io.papermc.paper.ServerBrandConstants.DOWNLOAD_PAGE, NamedTextColor.GOLD) // Plazma - Fork-friendly Rebranding
-                         .hoverEvent(text("Click to open", NamedTextColor.WHITE))
--                        .clickEvent(ClickEvent.openUrl(DOWNLOAD_PAGE))));
-+                        .clickEvent(ClickEvent.openUrl(io.papermc.paper.ServerBrandConstants.DOWNLOAD_PAGE)))); // Plazma - Fork-friendly Rebranding
-         };
-     }
- 
-+    /* // Plazma - TODO: CI Checking
-     private static int fetchDistanceFromSiteApi(final ServerBuildInfo build, final int jenkinsBuild) {
-         try {
-             try (final BufferedReader reader = Resources.asCharSource(
-@@ -105,6 +110,7 @@ public class PaperVersionFetcher implements VersionFetcher {
-             return DISTANCE_ERROR;
-         }
-     }
-+     */ // Plazma - TODO: CI Checking
- 
-     // Contributed by Techcable <Techcable@outlook.com> in GH-65
-     private static int fetchDistanceFromGitHub(final String repo, final String branch, final String hash) {
-diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-index 90b3526479320064378f2cde6c2f2b8e48a59ba6..21658c61ad091647d5421d1dbf892d03ca175c74 100644
---- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-+++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-@@ -20,7 +20,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
-     @Override
-     protected LineReader buildReader(LineReaderBuilder builder) {
-         builder
--                .appName("Purpur") // Purpur
-+                .appName(io.papermc.paper.ServerBrandConstants.BRAND_NAME) // Purpur // Plazma - Fork-friendly Rebranding
-                 .variable(LineReader.HISTORY_FILE, java.nio.file.Paths.get(".console_history"))
-                 .completer(new ConsoleCommandCompleter(this.server))
-                 .option(LineReader.Option.COMPLETE_IN_WORD, true);
-diff --git a/src/main/java/io/papermc/paper/ServerBrandConstants.java b/src/main/java/io/papermc/paper/ServerBrandConstants.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..3af005ce2bbd30601917987d8c831db23c733ab8
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/ServerBrandConstants.java
-@@ -0,0 +1,29 @@
-+package io.papermc.paper;
-+
-+import org.jetbrains.annotations.Nullable;
-+
-+public interface ServerBrandConstants {
-+
-+    // Basic brand informations
-+    String BRAND_NAME = "Plazma";
-+    String RESOURCE_PATH = "META-INF/maven/org.plazmamc.plazma/plazma-api/pom.properties";
-+
-+    @Nullable
-+    String ASCII_LOGO = """
-+        
-+        \033[38;2;215;23;133m█\033[38;2;212;24;134m█\033[38;2;209;26;134m█\033[38;2;205;27;135m█\033[38;2;202;28;136m█\033[38;2;199;30;136m█\033[38;2;196;31;137m╗\033[38;2;193;33;138m  \033[38;2;190;34;138m█\033[38;2;186;35;139m█\033[38;2;183;37;140m╗\033[38;2;180;38;140m \033[38;2;177;39;141m \033[38;2;174;41;142m \033[38;2;170;42;142m \033[38;2;167;43;143m  \033[38;2;164;45;144m \033[38;2;161;46;144m█\033[38;2;158;47;145m█\033[38;2;155;49;146m█\033[38;2;151;50;146m█\033[38;2;148;52;147m█\033[38;2;145;53;148m╗\033[38;2;142;54;148m  \033[38;2;139;56;149m█\033[38;2;135;57;149m█\033[38;2;132;58;150m█\033[38;2;129;60;151m█\033[38;2;126;61;151m█\033[38;2;123;62;152m█\033[38;2;120;64;153m█\033[38;2;116;65;153m╗ \033[38;2;113;67;154m█\033[38;2;110;68;155m█\033[38;2;107;69;155m█\033[38;2;104;71;156m╗\033[38;2;101;72;157m \033[38;2;97;73;157m \033[38;2;94;75;158m \033[38;2;91;76;159m█\033[38;2;88;77;159m█\033[38;2;85;79;160m█\033[38;2;81;80;161m╗ \033[38;2;78;81;161m \033[38;2;75;83;162m█\033[38;2;72;84;163m█\033[38;2;69;86;163m█\033[38;2;66;87;164m█\033[38;2;62;88;165m█\033[38;2;59;90;165m╗\033[38;2;56;91;166m\s
-+        \033[38;2;215;23;133m█\033[38;2;212;24;134m█\033[38;2;209;26;134m╔\033[38;2;205;27;135m═\033[38;2;202;28;136m═\033[38;2;199;30;136m█\033[38;2;196;31;137m█\033[38;2;193;33;138m╗ \033[38;2;190;34;138m█\033[38;2;186;35;139m█\033[38;2;183;37;140m║\033[38;2;180;38;140m \033[38;2;177;39;141m \033[38;2;174;41;142m \033[38;2;170;42;142m \033[38;2;167;43;143m  \033[38;2;164;45;144m█\033[38;2;161;46;144m█\033[38;2;158;47;145m╔\033[38;2;155;49;146m═\033[38;2;151;50;146m═\033[38;2;148;52;147m█\033[38;2;145;53;148m█\033[38;2;142;54;148m╗ \033[38;2;139;56;149m╚\033[38;2;135;57;149m═\033[38;2;132;58;150m═\033[38;2;129;60;151m█\033[38;2;126;61;151m█\033[38;2;123;62;152m█\033[38;2;120;64;153m╔\033[38;2;116;65;153m╝ \033[38;2;113;67;154m█\033[38;2;110;68;155m█\033[38;2;107;69;155m█\033[38;2;104;71;156m█\033[38;2;101;72;157m╗\033[38;2;97;73;157m \033[38;2;94;75;158m█\033[38;2;91;76;159m█\033[38;2;88;77;159m█\033[38;2;85;79;160m█\033[38;2;81;80;161m║ \033[38;2;78;81;161m█\033[38;2;75;83;162m█\033[38;2;72;84;163m╔\033[38;2;69;86;163m═\033[38;2;66;87;164m═\033[38;2;62;88;165m█\033[38;2;59;90;165m█\033[38;2;56;91;166m╗
-+        \033[38;2;215;23;133m█\033[38;2;212;24;134m█\033[38;2;209;26;134m█\033[38;2;205;27;135m█\033[38;2;202;28;136m█\033[38;2;199;30;136m█\033[38;2;196;31;137m╔\033[38;2;193;33;138m╝ \033[38;2;190;34;138m█\033[38;2;186;35;139m█\033[38;2;183;37;140m║\033[38;2;180;38;140m \033[38;2;177;39;141m \033[38;2;174;41;142m \033[38;2;170;42;142m \033[38;2;167;43;143m  \033[38;2;164;45;144m█\033[38;2;161;46;144m█\033[38;2;158;47;145m█\033[38;2;155;49;146m█\033[38;2;151;50;146m█\033[38;2;148;52;147m█\033[38;2;145;53;148m█\033[38;2;142;54;148m║ \033[38;2;139;56;149m \033[38;2;135;57;149m \033[38;2;132;58;150m█\033[38;2;129;60;151m█\033[38;2;126;61;151m█\033[38;2;123;62;152m╔\033[38;2;120;64;153m╝\033[38;2;116;65;153m  \033[38;2;113;67;154m█\033[38;2;110;68;155m█\033[38;2;107;69;155m╔\033[38;2;104;71;156m█\033[38;2;101;72;157m█\033[38;2;97;73;157m█\033[38;2;94;75;158m█\033[38;2;91;76;159m╔\033[38;2;88;77;159m█\033[38;2;85;79;160m█\033[38;2;81;80;161m║ \033[38;2;78;81;161m█\033[38;2;75;83;162m█\033[38;2;72;84;163m█\033[38;2;69;86;163m█\033[38;2;66;87;164m█\033[38;2;62;88;165m█\033[38;2;59;90;165m█\033[38;2;56;91;166m║
-+        \033[38;2;215;23;133m█\033[38;2;212;24;134m█\033[38;2;209;26;134m╔\033[38;2;205;27;135m═\033[38;2;202;28;136m═\033[38;2;199;30;136m═\033[38;2;196;31;137m╝\033[38;2;193;33;138m  \033[38;2;190;34;138m█\033[38;2;186;35;139m█\033[38;2;183;37;140m║\033[38;2;180;38;140m \033[38;2;177;39;141m \033[38;2;174;41;142m \033[38;2;170;42;142m \033[38;2;167;43;143m  \033[38;2;164;45;144m█\033[38;2;161;46;144m█\033[38;2;158;47;145m╔\033[38;2;155;49;146m═\033[38;2;151;50;146m═\033[38;2;148;52;147m█\033[38;2;145;53;148m█\033[38;2;142;54;148m║ \033[38;2;139;56;149m \033[38;2;135;57;149m█\033[38;2;132;58;150m█\033[38;2;129;60;151m█\033[38;2;126;61;151m╔\033[38;2;123;62;152m╝\033[38;2;120;64;153m \033[38;2;116;65;153m  \033[38;2;113;67;154m█\033[38;2;110;68;155m█\033[38;2;107;69;155m║\033[38;2;104;71;156m╚\033[38;2;101;72;157m█\033[38;2;97;73;157m█\033[38;2;94;75;158m╔\033[38;2;91;76;159m╝\033[38;2;88;77;159m█\033[38;2;85;79;160m█\033[38;2;81;80;161m║ \033[38;2;78;81;161m█\033[38;2;75;83;162m█\033[38;2;72;84;163m╔\033[38;2;69;86;163m═\033[38;2;66;87;164m═\033[38;2;62;88;165m█\033[38;2;59;90;165m█\033[38;2;56;91;166m║
-+        \033[38;2;215;23;133m█\033[38;2;212;24;134m█\033[38;2;209;26;134m║\033[38;2;205;27;135m \033[38;2;202;28;136m \033[38;2;199;30;136m \033[38;2;196;31;137m \033[38;2;193;33;138m  \033[38;2;190;34;138m█\033[38;2;186;35;139m█\033[38;2;183;37;140m█\033[38;2;180;38;140m█\033[38;2;177;39;141m█\033[38;2;174;41;142m█\033[38;2;170;42;142m█\033[38;2;167;43;143m╗ \033[38;2;164;45;144m█\033[38;2;161;46;144m█\033[38;2;158;47;145m║\033[38;2;155;49;146m \033[38;2;151;50;146m \033[38;2;148;52;147m█\033[38;2;145;53;148m█\033[38;2;142;54;148m║ \033[38;2;139;56;149m█\033[38;2;135;57;149m█\033[38;2;132;58;150m█\033[38;2;129;60;151m█\033[38;2;126;61;151m█\033[38;2;123;62;152m█\033[38;2;120;64;153m█\033[38;2;116;65;153m╗ \033[38;2;113;67;154m█\033[38;2;110;68;155m█\033[38;2;107;69;155m║\033[38;2;104;71;156m \033[38;2;101;72;157m╚\033[38;2;97;73;157m═\033[38;2;94;75;158m╝\033[38;2;91;76;159m \033[38;2;88;77;159m█\033[38;2;85;79;160m█\033[38;2;81;80;161m║ \033[38;2;78;81;161m█\033[38;2;75;83;162m█\033[38;2;72;84;163m║\033[38;2;69;86;163m \033[38;2;66;87;164m \033[38;2;62;88;165m█\033[38;2;59;90;165m█\033[38;2;56;91;166m║
-+        \033[38;2;215;23;133m╚\033[38;2;212;24;134m═\033[38;2;209;26;134m╝\033[38;2;205;27;135m \033[38;2;202;28;136m \033[38;2;199;30;136m \033[38;2;196;31;137m \033[38;2;193;33;138m  \033[38;2;190;34;138m╚\033[38;2;186;35;139m═\033[38;2;183;37;140m═\033[38;2;180;38;140m═\033[38;2;177;39;141m═\033[38;2;174;41;142m═\033[38;2;170;42;142m═\033[38;2;167;43;143m╝ \033[38;2;164;45;144m╚\033[38;2;161;46;144m═\033[38;2;158;47;145m╝\033[38;2;155;49;146m \033[38;2;151;50;146m \033[38;2;148;52;147m╚\033[38;2;145;53;148m═\033[38;2;142;54;148m╝ \033[38;2;139;56;149m╚\033[38;2;135;57;149m═\033[38;2;132;58;150m═\033[38;2;129;60;151m═\033[38;2;126;61;151m═\033[38;2;123;62;152m═\033[38;2;120;64;153m═\033[38;2;116;65;153m╝ \033[38;2;113;67;154m╚\033[38;2;110;68;155m═\033[38;2;107;69;155m╝\033[38;2;104;71;156m \033[38;2;101;72;157m \033[38;2;97;73;157m \033[38;2;94;75;158m \033[38;2;91;76;159m \033[38;2;88;77;159m╚\033[38;2;85;79;160m═\033[38;2;81;80;161m╝ \033[38;2;78;81;161m╚\033[38;2;75;83;162m═\033[38;2;72;84;163m╝\033[38;2;69;86;163m \033[38;2;66;87;164m \033[38;2;62;88;165m╚\033[38;2;59;90;165m═\033[38;2;56;91;166m╝\033[0m
-+        """;
-+
-+    // Support URLs
-+    String DOWNLOAD_PAGE = "https://plazmamc.org/downloads";
-+    String CONFIG_REFERENCE = "https://docs.plazmamc.org/plazma/administration/reference/configurations";
-+    String START_GUIDE = "https://docs.plazmamc.org/plazma/administration/getting-started";
-+    String USAGE_GUIDE = "https://docs.plazmamc.org/plazma/administration/getting-started/next-step";
-+    String SUPPORT_PAGE = "https://github.com/PlazmaMC/Plazma/issues";
-+
-+}
-diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-index a6e5950b5875cafd734300cdfbf58f5d3736f3c8..a337e2c9576fb70a8ee9082e9b69719c804b286e 100644
---- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-+++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-@@ -30,9 +30,6 @@ public record ServerBuildInfoImpl(
-     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 BRAND_PURPUR_NAME = "Purpur"; // Purpur
--
-     private static final String BUILD_DEV = "DEV";
- 
-     public ServerBuildInfoImpl() {
-@@ -43,9 +40,9 @@ public record ServerBuildInfoImpl(
-         this(
-             getManifestAttribute(manifest, ATTRIBUTE_BRAND_ID)
-                 .map(Key::key)
--                .orElse(BRAND_PURPUR_ID), // Purpur
-+                .orElse(BRAND_ID), // Purpur // Plazma - Fork-friendly Rebranding
-             getManifestAttribute(manifest, ATTRIBUTE_BRAND_NAME)
--                .orElse(BRAND_PURPUR_NAME), // Purpur
-+                .orElse(ServerBrandConstants.BRAND_NAME), // Purpur // Plazma - Fork-friendly Rebranding
-             SharedConstants.getCurrentVersion().getId(),
-             SharedConstants.getCurrentVersion().getName(),
-             getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER)
-@@ -62,7 +59,7 @@ public record ServerBuildInfoImpl(
- 
-     @Override
-     public boolean isBrandCompatible(final @NotNull Key brandId) {
--        return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID); // Purpur
-+        return brandId.equals(this.brandId) || SUPPORTED_BRANDS.contains(brandId); // Purpur // Plazma - Fork-friendly Rebranding
-     }
- 
-     @Override
-diff --git a/src/main/java/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java
-index 87e5f614ba988547a827486740db217e28585773..f5aac6cde46ca08a4d4792e38f514bb3d8188ae8 100644
---- a/src/main/java/io/papermc/paper/configuration/Configurations.java
-+++ b/src/main/java/io/papermc/paper/configuration/Configurations.java
-@@ -113,9 +113,7 @@ public abstract class Configurations<G, W> {
-         try {
-             loader.save(node);
-         } catch (ConfigurateException ex) {
--            if (ex.getCause() instanceof AccessDeniedException) {
--                LOGGER.warn("Could not save {}: Paper could not persist the full set of configuration settings in the configuration file. Any setting missing from the configuration file will be set with its default value in memory. Admins should make sure to review the configuration documentation at https://docs.papermc.io/paper/configuration for more details.", filename, ex);
--            } else throw ex;
-+            if (ex.getCause() instanceof AccessDeniedException) LOGGER.warn("Could not save {}: {} could not persist the full set of configuration settings in the configuration file. Any setting missing from the configuration file will be set with its default value in memory. Admins should make sure to review the configuration documentation at {} for more details.", filename, io.papermc.paper.ServerBrandConstants.BRAND_NAME, io.papermc.paper.ServerBrandConstants.CONFIG_REFERENCE, ex); else throw ex; // Plazma - Fork-friendly Rebranding
-         }
-     }
- 
-diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
-index 710477ae27ebc5afdf0012ef0867d05efd293c24..3a5e7546c5cc1fcec880cece3f0d0b04ec23cc18 100644
---- a/src/main/java/net/minecraft/CrashReport.java
-+++ b/src/main/java/net/minecraft/CrashReport.java
-@@ -32,13 +32,13 @@ public class CrashReport {
-     private boolean trackingStackTrace = true;
-     private StackTraceElement[] uncategorizedStackTrace = new StackTraceElement[0];
-     private final SystemReport systemReport = new SystemReport();
--    private List<String> extraInfo = List.of("", "DO NOT REPORT THIS TO PAPER! REPORT TO PURPUR INSTEAD!", ""); // Purpur - Rebrand
-+    private List<String> extraInfo = List.of("", "DO NOT REPORT THIS TO PAPER OR PURPUR! REPORT TO " + io.papermc.paper.ServerBrandConstants.BRAND_NAME.toUpperCase() + " INSTEAD!", ""); // Purpur - Rebrand // Plazma - Fork-friendly Rebranding
- 
-     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
-+        this.systemReport.setDetail(io.papermc.paper.ServerBrandConstants.BRAND_NAME + " CraftBukkit Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit // Plazma - Fork-friendly Rebranding
-     }
- 
-     public String getTitle() {
-diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index f0d762bd140fad27ae73bcf3e61b640b9e3f2592..3a9f7143505ba1a70bcd224ee8fef5c844a94ed1 100644
---- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
-@@ -108,6 +108,11 @@ public class Main {
-             */ // CraftBukkit end
- 
-         try {
-+            // Plazma start - Fork-friendly Rebranding
-+            //noinspection ConstantValue
-+            if (io.papermc.paper.ServerBrandConstants.ASCII_LOGO != null)
-+                System.out.println(io.papermc.paper.ServerBrandConstants.ASCII_LOGO);
-+            // Plazma end - Fork-friendly Rebranding
- 
-             Path path = (Path) optionset.valueOf("pidFile"); // CraftBukkit
- 
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1ad565ad881cb7efd4a3919c164f275006b4b789..b281048d9cb54d3acb53da8f722d00c1786f1fb6 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1277,7 +1277,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                 LOGGER.info("*************************************************************************************");
-                 LOGGER.info("This is the first time you're starting this server.");
-                 LOGGER.info("It's recommended you read our 'Getting Started' documentation for guidance.");
--                LOGGER.info("View this and more helpful information here: https://docs.papermc.io/paper/next-steps");
-+                LOGGER.info("View this and more helpful information here: {}", io.papermc.paper.ServerBrandConstants.START_GUIDE); // Plazma - Fork-friendly Rebranding
-                 LOGGER.info("*************************************************************************************");
-             }
-             // Paper end - Add onboarding message for initial server start
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index e9ad8e2ac267c46df80e884308df8bb12d0deeff..4aaeb0521a5e48a7d74a7968c952fcca7b6c0433 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -775,7 +775,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         org.bukkit.plugin.Plugin[] plugins = this.server.getPluginManager().getPlugins();
- 
-         result.append(this.server.getName());
--        result.append(" on Bukkit ");
-+        result.append(" on ").append(io.papermc.paper.ServerBrandConstants.BRAND_NAME).append(" "); // Plazma - Fork-friendly Rebranding
-         result.append(this.server.getBukkitVersion());
- 
-         if (plugins.length > 0 && this.server.getQueryPlugins()) {
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index ee70e7a2f87ca31b1c2918148d585e90601d277b..568141881ffb26b425be452c79ecc146821ba1d9 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-@@ -56,10 +56,10 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
-     public final boolean onlineMode = this.get("online-mode", true);
-     public final boolean preventProxyConnections = this.get("prevent-proxy-connections", false);
-     public final String serverIp = this.get("server-ip", "");
--    public final String serverName = this.get("server-name", "Unknown Server"); // Purpur
-+    public final String serverName = this.get("server-name", "A " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " Server"); // Purpur // Plazma - Fork-friendly Rebranding
-     public final boolean pvp = this.get("pvp", true);
-     public final boolean allowFlight = this.get("allow-flight", false);
--    public final String motd = this.get("motd", "A Minecraft Server");
-+    public final String motd = this.get("motd", "A " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " Server"); // Plazma - Fork-friendly Rebranding
-     public final String bugReportLink = this.get("bug-report-link", "");
-     public final boolean forceGameMode = this.get("force-gamemode", false);
-     public final boolean enforceWhitelist = this.get("enforce-whitelist", false);
-diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
-index 8f74c2ec5252b6265549589310d742337c91cb2c..ecb5a046514e3cd448cbf633c728831b1eb5d30b 100644
---- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
-+++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
-@@ -56,7 +56,7 @@ public class MinecraftServerGui extends JComponent {
-             ;
-         }
- 
--        final JFrame jframe = new JFrame("Purpur Minecraft server"); // Purpur
-+        final JFrame jframe = new JFrame(io.papermc.paper.ServerBrandConstants.BRAND_NAME + " Minecraft server"); // Purpur // Plazma - Fork-friendly Rebranding
-         final MinecraftServerGui servergui = new MinecraftServerGui(server);
- 
-         jframe.setDefaultCloseOperation(2);
-@@ -64,7 +64,7 @@ public class MinecraftServerGui extends JComponent {
-         jframe.pack();
-         jframe.setLocationRelativeTo((Component) null);
-         jframe.setVisible(true);
--        jframe.setName("Purpur Minecraft server"); // Paper - Improve ServerGUI // Purpur
-+        jframe.setName(io.papermc.paper.ServerBrandConstants.BRAND_NAME + " Minecraft server"); // Paper - Improve ServerGUI // Purpur // Plazma - Fork-friendly Rebranding
- 
-         // Paper start - Improve ServerGUI
-         try {
-@@ -76,7 +76,7 @@ public class MinecraftServerGui extends JComponent {
-         jframe.addWindowListener(new WindowAdapter() {
-             public void windowClosing(WindowEvent windowevent) {
-                 if (!servergui.isClosing.getAndSet(true)) {
--                    jframe.setTitle("Purpur Minecraft server - shutting down!"); // Purpur
-+                    jframe.setTitle(io.papermc.paper.ServerBrandConstants.BRAND_NAME + " Minecraft server - shutting down!"); // Purpur // Plazma - Fork-friendly Rebranding
-                     server.halt(true);
-                     servergui.runFinalizers();
-                 }
-@@ -123,7 +123,7 @@ public class MinecraftServerGui extends JComponent {
- 
-     // Paper start - Add onboarding message for initial server start
-     private JComponent buildOnboardingPanel() {
--        String onboardingLink = "https://docs.papermc.io/paper/next-steps";
-+        String onboardingLink = io.papermc.paper.ServerBrandConstants.USAGE_GUIDE; // Plazma - Fork-friendly Rebranding
-         JPanel jPanel = new JPanel();
- 
-         javax.swing.JLabel jLabel = new javax.swing.JLabel("If you need help setting up your server you can visit:");
-diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-index 4a96d914f8aa6f0c5f13fc85369a311f25835ac2..5b4285d6b37346bcea3bf072c6f00bd50c62e703 100644
---- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-+++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-@@ -89,7 +89,7 @@ public class DamageSource {
- 
-     public DamageSource customEventDamager(Entity entity) {
-         if (this.directEntity != null) {
--            throw new IllegalStateException("Cannot set custom event damager when direct entity is already set (report a bug to Paper)");
-+            throw new IllegalStateException("Cannot set custom event damager when direct entity is already set (report a bug to " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + ")"); // Plazma - Fork-friendly Rebranding
-         }
-         DamageSource damageSource = this.cloneInstance();
-         damageSource.customEventDamager = entity;
-diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index 0dde7cd71a32e6c0cde6cbbaef585896a3d7dae7..9b4afcd708270225da272ba5278397ffe1f91403 100644
---- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -274,7 +274,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
- 
-     // Paper start
-     private static void printOversizedLog(String msg, Path file, int x, int z) {
--        org.apache.logging.log4j.LogManager.getLogger().fatal(msg + " (" + file.toString().replaceAll(".+[\\\\/]", "") + " - " + x + "," + z + ") Go clean it up to remove this message. /minecraft:tp " + (x<<4)+" 128 "+(z<<4) + " - DO NOT REPORT THIS TO PURPUR - You may ask for help on Discord, but do not file an issue. These error messages can not be removed."); // Purpur
-+        org.apache.logging.log4j.LogManager.getLogger().fatal(msg + " (" + file.toString().replaceAll(".+[\\\\/]", "") + " - " + x + "," + z + ") Go clean it up to remove this message. /minecraft:tp " + (x<<4)+" 128 "+(z<<4) + " - DO NOT REPORT THIS TO " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " - You may ask for help on Discord, but do not file an issue. These error messages can not be removed."); // Purpur // Plazma - Fork-friendly Rebranding
-     }
- 
-     private static CompoundTag readOversizedChunk(RegionFile regionfile, ChunkPos chunkCoordinate) throws IOException {
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index b2d60b214b58d9a5fadf3629e5ebc358c904d1c6..f9ee08eae4a1e1c6490e4682901609c0e4d52579 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -143,7 +143,7 @@ public class Main {
- 
-                 this.acceptsAll(Main.asList("noconsole"), "Disables the console");
- 
--                this.acceptsAll(Main.asList("v", "version"), "Show the CraftBukkit Version");
-+                this.acceptsAll(Main.asList("v", "version"), "Show the " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " Version"); // Plazma - Fork-friendly Rebranding
- 
-                 this.acceptsAll(Main.asList("demo"), "Demo mode");
- 
-@@ -188,7 +188,7 @@ public class Main {
-                 acceptsAll(asList("server-name"), "Name of the server")
-                         .withRequiredArg()
-                         .ofType(String.class)
--                        .defaultsTo("Unknown Server")
-+                        .defaultsTo("A " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " Server") // Plazma - Fork-friendly Rebranding
-                         .describedAs("Name");
-                 // Paper end
-             }
-diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index c914e1e13c4f64f24efa5f825e58efb69632bfa6..c558a2621381cf54661fd3926a00982af2037365 100644
---- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -491,7 +491,7 @@ public class CraftScheduler implements BukkitScheduler {
-                 this.parsePending();
-             } else {
-                 // this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(this.currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper
--                task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to Purpur"); // Paper // Purpur
-+                task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to " + io.papermc.paper.ServerBrandConstants.BRAND_NAME); // Paper // Purpur // Plazma - Fork-friendly Rebranding
-                 // We don't need to parse pending
-                 // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
-             }
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..e0414f59b7c5ef149d8e52ebf76dc3e46d9de4d3 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.purpurmc.purpur/purpur-api/pom.properties"); // Pufferfish // Purpur
-+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream(io.papermc.paper.ServerBrandConstants.RESOURCE_PATH); // Pufferfish // Purpur // Plazma - Fork-friendly Rebranding
-         Properties properties = new Properties();
- 
-         if (stream != null) {
-@@ -20,7 +20,7 @@ public final class Versioning {
- 
-                 result = properties.getProperty("version");
-             } catch (IOException ex) {
--                Logger.getLogger(Versioning.class.getName()).log(Level.SEVERE, "Could not get Bukkit version!", ex);
-+                Logger.getLogger(Versioning.class.getName()).log(Level.SEVERE, "Could not get " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " version!", ex); // Plazma - Fork-friendly Rebranding
-             }
-         }
- 
-diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index f51cc3de3ca935ef90f7f0e9dd0506b856fc55f3..d889d964067058762fcffab9945fe586ce8d2a07 100644
---- a/src/main/java/org/spigotmc/WatchdogThread.java
-+++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -155,14 +155,14 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
-                 if (isLongTimeout) {
-                 // Paper end
-                 log.log( Level.SEVERE, "------------------------------" );
--                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Purpur bug." ); // Paper // Purpur
-+                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " bug." ); // Paper // Purpur // Plazma - Fork-friendly Rebranding
-                 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 Purpur bug, please report this to https://github.com/PurpurMC/Purpur/issues" ); // Purpur
-+                log.log( Level.SEVERE, "If you are unsure or still think this is a " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " bug, please report this to " + io.papermc.paper.ServerBrandConstants.SUPPORT_PAGE ); // Purpur // Plazma - Fork-friendly Rebranding
-                 log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
--                log.log( Level.SEVERE, "Purpur version: " + Bukkit.getServer().getVersion() ); // Purpur
-+                log.log( Level.SEVERE,  io.papermc.paper.ServerBrandConstants.BRAND_NAME + " version: " + Bukkit.getServer().getVersion() ); // Purpur // Plazma - Fork-friendly Rebranding
-                 //
-                 if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
-                 {
-@@ -184,12 +184,12 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
-                 // Paper end
-                 } else
-                 {
--                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PURPUR - THIS IS NOT A BUG OR A CRASH  - " + Bukkit.getServer().getVersion() + " ---"); // Purpur
-+                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO " + io.papermc.paper.ServerBrandConstants.BRAND_NAME.toUpperCase() + " - THIS IS NOT A BUG OR A CRASH  - " + Bukkit.getServer().getVersion() + " ---"); // Purpur // Plazma - Fork-friendly Rebranding
-                     log.log(Level.SEVERE, "The server has not responded for " + (currentTime - lastTick) / 1000 + " seconds! Creating thread dump");
-                 }
-                 // Paper end - Different message for short timeout
-                 log.log( Level.SEVERE, "------------------------------" );
--                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Purpur!):" ); // Paper // Purpur
-+                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + "!):" ); // Paper // Purpur // Plazma - Fork-friendly Rebranding
-                 ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(MinecraftServer.getServer(), isLongTimeout); // Paper - rewrite chunk system
-                 this.dumpTickingInfo(); // Paper - log detailed tick information
-                 WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
-@@ -205,7 +205,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
-                     WatchdogThread.dumpThread( thread, log );
-                 }
-                 } else {
--                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PURPUR - THIS IS NOT A BUG OR A CRASH ---"); // Purpur
-+                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " - THIS IS NOT A BUG OR A CRASH ---"); // Purpur // Plazma - Fork-friendly Rebranding
-                 }
- 
-                 log.log( Level.SEVERE, "------------------------------" );

patches/server/0007-Setup-basic-configuration-sections.patch

@@ -1,128 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 5 Nov 2023 10:47:05 +0900
-Subject: [PATCH] Setup basic configuration sections
-
-
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index d8006ae086c18a4ef43906d516eba0d5fd397f5f..aff5c68bc715c6ea9b5b808e5a94cbac9a3725ba 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -3,6 +3,7 @@ package org.plazmamc.plazma.configurations;
- import io.papermc.paper.configuration.Configuration;
- import io.papermc.paper.configuration.ConfigurationPart;
- import org.jetbrains.annotations.NotNull;
-+import org.spongepowered.configurate.objectmapping.meta.PostProcess;
- import org.spongepowered.configurate.objectmapping.meta.Setting;
- 
- @SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "InnerClassMayBeStatic"})
-@@ -23,4 +24,49 @@ public class GlobalConfiguration extends ConfigurationPart {
-     @Setting(Configuration.VERSION_FIELD)
-     int version = VERSION;
- 
-+    public Player player;
-+    public class Player extends ConfigurationPart {
-+
-+
-+    }
-+
-+    @Setting("world-generation")
-+    public WorldGeneration worldgen;
-+    public class WorldGeneration extends ConfigurationPart {
-+
-+
-+    }
-+
-+    public Entity entity;
-+    public class Entity extends ConfigurationPart {
-+
-+
-+        @PostProcess
-+        public void post() {
-+        }
-+
-+    }
-+
-+    public World world;
-+    public class World extends ConfigurationPart {
-+
-+
-+        @PostProcess
-+        public void post() {
-+        }
-+
-+    }
-+
-+    public Structure structure;
-+    public class Structure extends ConfigurationPart {
-+
-+
-+    }
-+
-+    public Miscellaneous misc;
-+    public class Miscellaneous extends ConfigurationPart {
-+
-+
-+    }
-+
- }
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/RemovedConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/RemovedConfigurations.java
-index 25c0f5d28107b45677aa7b19bc0d5238512d9826..ac0f038de0ce5cf6df0b730af69d3229c3119eff 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/RemovedConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/RemovedConfigurations.java
-@@ -2,9 +2,12 @@ package org.plazmamc.plazma.configurations;
- 
- import org.spongepowered.configurate.NodePath;
- 
-+import static org.spongepowered.configurate.NodePath.path;
-+
- interface RemovedConfigurations {
- 
-     NodePath[] WORLD_PATHS = {
-+        path("structure", "nether-portal")
-     };
- 
-     NodePath[] GLOBAL_PATHS = {
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index f2d3d51cb4b8fc7a5fd6db1a63289fff6d32a1ea..8dce68cf7769fcd5ea03be32621ccb6bab174697 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-@@ -19,4 +19,38 @@ public class WorldConfigurations extends ConfigurationPart {
-     @Setting(Configuration.VERSION_FIELD)
-     int version = VERSION;
- 
-+    public Miscellaneous misc;
-+    public class Miscellaneous extends ConfigurationPart {
-+
-+
-+    }
-+
-+    public Entity entity;
-+    public class Entity extends ConfigurationPart {
-+
-+        public Phantom phantom;
-+        public class Phantom extends ConfigurationPart {
-+
-+
-+        }
-+
-+    }
-+
-+    public Structure structure;
-+    public class Structure extends ConfigurationPart {
-+
-+        public NetherPortal netherPortal;
-+        public class NetherPortal extends ConfigurationPart {
-+
-+
-+        }
-+
-+    }
-+
-+    public Block block;
-+    public class Block extends ConfigurationPart {
-+        
-+
-+    }
-+
- }

patches/server/0008-Warn-on-startup.patch

@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Fri, 3 May 2024 19:50:32 +0900
-Subject: [PATCH] Warn on startup
-
-
-diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 3a9f7143505ba1a70bcd224ee8fef5c844a94ed1..e0885f53aa3d0ae95a40574806af70c865025a9d 100644
---- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
-@@ -113,6 +113,18 @@ public class Main {
-             if (io.papermc.paper.ServerBrandConstants.ASCII_LOGO != null)
-                 System.out.println(io.papermc.paper.ServerBrandConstants.ASCII_LOGO);
-             // Plazma end - Fork-friendly Rebranding
-+            // Plazma start - Warn on startup
-+            if (!org.plazmamc.plazma.Options.NO_WARN) {
-+                LOGGER.warn("Warning! " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " may cause unexpected problems, so be sure to test it thoroughly before using it on a public server.");
-+                if (io.papermc.paper.ServerBuildInfo.buildInfo().asString(io.papermc.paper.ServerBuildInfo.StringRepresentation.VERSION_FULL).contains("DEV")) {
-+                    LOGGER.error("*********************** CAUTION ***********************");
-+                    LOGGER.error("This version is a development version of {}.", io.papermc.paper.ServerBrandConstants.BRAND_NAME);
-+                    LOGGER.error("Nobody knows what kind of problem you're going to have, and there's always the possibility of unexpected problems.");
-+                    LOGGER.error("Never use this version on a public server, and after you've tested it enough before using it!");
-+                    LOGGER.error("*******************************************************");
-+                }
-+            }
-+            // Plazma end
- 
-             Path path = (Path) optionset.valueOf("pidFile"); // CraftBukkit
- 
-diff --git a/src/main/java/org/plazmamc/plazma/Options.java b/src/main/java/org/plazmamc/plazma/Options.java
-index ca11bd22a65c8b9f4fffb1832ada8c519ab75b98..5d41bd4d4b86ca0c7c03d3ac6e75b3f1f1abe73b 100644
---- a/src/main/java/org/plazmamc/plazma/Options.java
-+++ b/src/main/java/org/plazmamc/plazma/Options.java
-@@ -6,5 +6,6 @@ import static java.lang.System.getProperty;
- public interface Options {
- 
-     boolean NO_OPTIMIZE = getBoolean("Plazma.disableConfigOptimization");
-+    boolean NO_WARN = getBoolean("Plazma.iKnowWhatIAmDoing");
- 
- }

patches/server/0009-Always-agree-EULA-on-development-mode.patch

@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 5 Nov 2023 10:13:14 +0900
-Subject: [PATCH] Always agree EULA on development mode
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 6734821658e7679f328336038587390a262f2b64..787d3447f328c59deabb6b07b9f72f9fbce71cba 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -151,7 +151,7 @@ fun TaskContainer.registerRunTask(
-         languageVersion.set(JavaLanguageVersion.of(21))
-         vendor.set(JvmVendorSpec.JETBRAINS)
-     })
--    jvmArgs("-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods")
-+    jvmArgs("-DPlazma.DevelopmentEnvironment", "-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods") // Plazma - Always agree EULA on development mode
- 
-     if (rootProject.childProjects["test-plugin"] != null) {
-         val testPluginJar = rootProject.project(":test-plugin").tasks.jar.flatMap { it.archiveFile }
-diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index e0885f53aa3d0ae95a40574806af70c865025a9d..3978c93a847c859c70446a6d6157fdb49c0bc74c 100644
---- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
-@@ -179,6 +179,7 @@ public class Main {
- 
-             // Spigot Start
-             boolean eulaAgreed = Boolean.getBoolean( "com.mojang.eula.agree" );
-+            eulaAgreed = eulaAgreed || Boolean.getBoolean("Paper.pushPaperAssetsRoot"); // Plazma - Always agree EULA on development mode
-             if ( eulaAgreed )
-             {
-                 System.err.println( "You have used the Spigot command line EULA agreement flag." );

patches/server/0010-Add-more-metrics.patch

@@ -1,98 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 5 Nov 2023 10:26:26 +0900
-Subject: [PATCH] Add more metrics
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 8d5a52c5762c3d9b44dcdf00ae312e0bdc01fa1f..48d33d4131af90eee35c9553898a2ac7ec5e2b7e 100644
---- a/src/main/java/com/destroystokyo/paper/Metrics.java
-+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
-@@ -636,38 +636,59 @@ public class Metrics {
-                     return map;
-                 }));
- 
--                metrics.addCustomChart(new Metrics.DrilldownPie("legacy_plugins", () -> {
--                    Map<String, Map<String, Integer>> map = new HashMap<>();
-+                // Plazma start - Add more metrics information
-+                metrics.addCustomChart(new DrilldownPie("datapacks", () -> {
-+                    int datapacks = Bukkit.getDatapackManager().getEnabledPacks().size();
-+                    Map<String, Integer> entry = Collections.singletonMap(String.valueOf(datapacks), 1);
-+
-+                    if (datapacks == 0) return Collections.singletonMap("0", entry);
-+                    else if (datapacks <= 5) return Collections.singletonMap("1-5", entry);
-+                    else if (datapacks <= 10) return Collections.singletonMap("6-10", entry);
-+                    else if (datapacks <= 25) return Collections.singletonMap("11-25", entry);
-+                    else if (datapacks <= 50) return Collections.singletonMap("26-50", entry);
-+                    else if (datapacks <= 100) return Collections.singletonMap("51+", entry);
-+                    else return Collections.singletonMap("101+ \uD83D\uDE2E", entry);
-+                }));
- 
--                    // count legacy plugins
--                    int legacy = 0;
--                    for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
--                        if (CraftMagicNumbers.isLegacy(plugin.getDescription())) {
--                            legacy++;
--                        }
--                    }
-+                metrics.addCustomChart(new DrilldownPie("plugins", () -> {
-+                    int pluginCount = Arrays.stream(Bukkit.getPluginManager().getPlugins()).filter(Plugin::isEnabled).toList().size();
-+                    Map<String, Integer> entry = Collections.singletonMap(String.valueOf(pluginCount), 1);
-+
-+                    if (pluginCount == 0) return Collections.singletonMap("0", entry);
-+                    else if (pluginCount <= 5) return Collections.singletonMap("1-5", entry);
-+                    else if (pluginCount <= 10) return Collections.singletonMap("6-10", entry);
-+                    else if (pluginCount <= 25) return Collections.singletonMap("11-25", entry);
-+                    else if (pluginCount <= 50) return Collections.singletonMap("26-50", entry);
-+                    else if (pluginCount <= 100) return Collections.singletonMap("51-100", entry);
-+                    else return Collections.singletonMap("101+ \uD83D\uDE2E", entry);
-+                }));
- 
--                    // 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:
--                    }
-+                metrics.addCustomChart(new DrilldownPie("disabled_plugins", () -> {
-+                    int disabled = Arrays.stream(Bukkit.getPluginManager().getPlugins()).filter(it -> !it.isEnabled()).toList().size();
-+                    Map<String, Integer> entry = Collections.singletonMap(String.valueOf(disabled), 1);
-+
-+                    if (disabled == 0) return Collections.singletonMap("0 \uD83D\uDE0E", entry); // :sunglasses:
-+                    else if (disabled <= 5) return Collections.singletonMap("1-5", entry);
-+                    else if (disabled <= 10) return Collections.singletonMap("6-10", entry);
-+                    else if (disabled <= 25) return Collections.singletonMap("11-25", entry);
-+                    else if (disabled <= 50) return Collections.singletonMap("26-50", entry);
-+                    else if (disabled <= 100) return Collections.singletonMap("51-100 \uD83D\uDE2D", entry); // :cry:
-+                    else return Collections.singletonMap("101+ \uD83D\uDC80", entry); // :skull:
-+                }));
- 
--                    return map;
-+                metrics.addCustomChart(new Metrics.DrilldownPie("legacy_plugins", () -> {
-+                    int legacy = (int) Arrays.stream(Bukkit.getPluginManager().getPlugins()).filter(p -> CraftMagicNumbers.isLegacy(p.getDescription())).count(); // Plazma
-+                    Map<String, Integer> entry = Collections.singletonMap(String.valueOf(legacy), 1);
-+
-+                    if (legacy == 0) return Collections.singletonMap("0 \uD83D\uDE0E", entry); // :sunglasses:
-+                    else if (legacy <= 5) return Collections.singletonMap("1-5", entry);
-+                    else if (legacy <= 10) return Collections.singletonMap("6-10", entry);
-+                    else if (legacy <= 25) return Collections.singletonMap("11-25", entry);
-+                    else if (legacy <= 50) return Collections.singletonMap("26-50", entry);
-+                    else if (legacy <= 100) return Collections.singletonMap("51-100 \uD83D\uDE2D", entry); // :cry:
-+                    else return Collections.singletonMap("101+ \uD83D\uDC80", entry); // :skull:
-                 }));
-+                // Plazma end - Add more metrics information
-             }
- 
-         }

patches/server/0013-Tweak-console-logging.patch

@@ -1,90 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 5 Nov 2023 10:40:49 +0900
-Subject: [PATCH] Tweak console logging
-
-
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 743ef664a84da93751feaa06e3522515cf9831f8..4e583dde426f8345fb931be6135a1427ed635ab2 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -194,16 +194,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-             DedicatedServer.LOGGER.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
-         }
- 
--        // Paper start - detect running as root
--        if (io.papermc.paper.util.ServerEnvironment.userIsRootOrAdmin()) {
--            DedicatedServer.LOGGER.warn("****************************");
--            DedicatedServer.LOGGER.warn("YOU ARE RUNNING THIS SERVER AS AN ADMINISTRATIVE OR ROOT USER. THIS IS NOT ADVISED.");
--            DedicatedServer.LOGGER.warn("YOU ARE OPENING YOURSELF UP TO POTENTIAL RISKS WHEN DOING THIS.");
--            DedicatedServer.LOGGER.warn("FOR MORE INFORMATION, SEE https://madelinemiller.dev/blog/root-minecraft-server/");
--            DedicatedServer.LOGGER.warn("****************************");
--        }
--        // Paper end - detect running as root
--
-         DedicatedServer.LOGGER.info("Loading properties");
-         DedicatedServerProperties dedicatedserverproperties = this.settings.getProperties();
- 
-@@ -235,6 +225,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         this.plazmaConfigurations.initializeGlobalConfiguration(this.registryAccess()); // Plazma - Configurable Plazma
-         this.plazmaConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess()); // Plazma - Configurable Plazma
-         // Paper end - initialize global and world-defaults configuration
-+        // Paper start - detect running as root // Plazma - Tweak console logging (moved down)
-+        if (io.papermc.paper.util.ServerEnvironment.userIsRootOrAdmin()) {
-+            DedicatedServer.LOGGER.warn("****************************");
-+            DedicatedServer.LOGGER.warn("YOU ARE RUNNING THIS SERVER AS AN ADMINISTRATIVE OR ROOT USER. THIS IS NOT ADVISED.");
-+            DedicatedServer.LOGGER.warn("YOU ARE OPENING YOURSELF UP TO POTENTIAL RISKS WHEN DOING THIS.");
-+            DedicatedServer.LOGGER.warn("FOR MORE INFORMATION, SEE https://madelinemiller.dev/blog/root-minecraft-server/");
-+            DedicatedServer.LOGGER.warn("****************************");
-+        }
-+        // Paper end - detect running as root
-         this.server.spark.enableEarlyIfRequested(); // Paper - spark
-         // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
-         if (this.convertOldUsers()) {
-@@ -332,6 +331,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord";
-         String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/";
-         // Paper end - Add Velocity IP Forwarding Support
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().consoleLogs.offlineWarnings && !(io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.onlineMode)) // Plazma - Tweak console logging
-         if (!this.usesAuthentication()) {
-             DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
-             DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
-@@ -345,7 +345,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-                 DedicatedServer.LOGGER.warn("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose.");
-             }
-             // Spigot end
--            DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
-+            DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file or set \"console-logs.offline-warnings\" to \"false\" in the config/plazma-global.yml file."); // Plazma - Tweak console logging
-         }
- 
- 
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 7d57f9b7fc4837f0f44f5c1cb76a5751a15b9254..8cc4907984f1a344e1983cd48744e92170ff650f 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1426,6 +1426,7 @@ public abstract class PlayerList {
-     }
- 
-     public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public
-+        if (!org.plazmamc.plazma.configurations.GlobalConfiguration.get().consoleLogs.notSecurePrefix) return true; // Plazma - Tweak console logging
-         return message.hasSignature() && !message.hasExpiredServer(Instant.now());
-     }
- 
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index aff5c68bc715c6ea9b5b808e5a94cbac9a3725ba..a8586f1bd161ad3470ae7f0590f1bba0cf627bd0 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -69,4 +69,13 @@ public class GlobalConfiguration extends ConfigurationPart {
- 
-     }
- 
-+    public ConsoleLogs consoleLogs;
-+    public class ConsoleLogs extends ConfigurationPart {
-+
-+        public boolean offlineWarnings = true;
-+        public boolean rootUserWarnings = true;
-+        public boolean notSecurePrefix = true;
-+
-+    }
-+
- }

patches/server/0016-Add-missing-Purpur-configuration-options.patch

@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
 Date: Sat, 25 Mar 2023 00:52:11 +0900
-Subject: [PATCH] Add missing purpur configuration options
+Subject: [PATCH] Add missing Purpur configuration options
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-index f60961bd5fdf6d1417e458b92e311c1a0a62463d..026cd57df33476841ed3a8f9fdc4d17a77e037b0 100644
+index 67ff60909dee395d42619c310bafc381b9bfce5d..42fc51827240f9f0091e006fa84a17c2fb51dddd 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-@@ -160,6 +160,18 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
+@@ -162,6 +162,18 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.allayMaxHealth);
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.allayScale);
      }
@@ -24,14 +24,14 @@ index f60961bd5fdf6d1417e458b92e311c1a0a62463d..026cd57df33476841ed3a8f9fdc4d17a
 +        return level().purpurConfig.allayAlwaysDropExp;
 +    }
 +    // Plazma end - Add missing purpur configuration options
-     // Purpur end
- 
+     // Purpur end - Configurable entity base attributes
      @Override
+     protected Brain.Provider<Allay> brainProvider() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 56d97225a909fd55f0d8aec992d5b6d42687c948..39cdecc382a71ef643d382ac506249bbb8df3d34 100644
+index 36f8bb5cf25566784e11988c91e1c7409f1ac5c8..d364866de67341e4a781b4f2bf3e7c187ee2bc8c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -96,6 +96,18 @@ public class Camel extends AbstractHorse {
+@@ -99,6 +99,18 @@ public class Camel extends AbstractHorse {
      public int getPurpurBreedTime() {
          return this.level().purpurConfig.camelBreedingTicks;
      }
@@ -47,11 +47,11 @@ index 56d97225a909fd55f0d8aec992d5b6d42687c948..39cdecc382a71ef643d382ac506249bb
 +        return level().purpurConfig.camelAlwaysDropExp;
 +    }
 +    // Plazma end - Add missing purpur configuration options
-     // Purpur end
- 
+     // Purpur end - Make entity breeding times configurable
      @Override
+     public void addAdditionalSaveData(CompoundTag nbt) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-index 501a12398c56fe0df4e76a3bbce0f98c6c5aa6cb..94ca735513901a180d42ac1cfd48d841142a6ef5 100644
+index d09aa48e20c9a6e0d465b93e3759556638041394..70772863011ce270bceaf679ea3776fb36d4f0b9 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 @@ -163,6 +163,23 @@ public class Frog extends Animal implements VariantHolder<Holder<FrogVariant>> {
@@ -75,16 +75,16 @@ index 501a12398c56fe0df4e76a3bbce0f98c6c5aa6cb..94ca735513901a180d42ac1cfd48d841
 +        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level().purpurConfig.frogMaxHealth);
 +    }
 +    // Plazma end - Add missing purpur configuration options
-     // Purpur end
+     // Purpur end - Ridables
  
-     public int getPurpurBreedTime() {
+     // Purpur start - Make entity breeding times configurable
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-index 071d14cc6697587ec14f02c69c78df364e7d8a8f..cc5c172b2fccc5fc59337203ed2b6edb2abc0c22 100644
+index 33429a9afeefce9238969b2894d0a9c033baca51..fee263bd88c19188f6ec8017893dfc12bdd15737 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
 @@ -93,6 +93,23 @@ public class Tadpole extends AbstractFish {
      protected void registerGoals() {
-         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
+         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
      }
 +
 +    // Plazma start - Add missing purpur configuration options
@@ -103,14 +103,14 @@ index 071d14cc6697587ec14f02c69c78df364e7d8a8f..cc5c172b2fccc5fc59337203ed2b6edb
 +        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level().purpurConfig.tadpoleMaxHealth);
 +    }
 +    // Plazma end - Add missing purpur configuration options
-     // Purpur end
+     // Purpur end - Ridables
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index 3fb4f12095883ea4ec6e0d60e0600b9de6ed7be2..f853730cee4fad2f3a5711e38918c65dcb1dc038 100644
+index 3fa391b638062196675d102b8731a96a51df8e15..86988932dc79e9ca33998044995187709ad5373b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-@@ -116,6 +116,18 @@ public class Sniffer extends Animal {
+@@ -119,6 +119,18 @@ public class Sniffer extends Animal {
      public int getPurpurBreedTime() {
          return this.level().purpurConfig.snifferBreedingTicks;
      }
@@ -126,16 +126,16 @@ index 3fb4f12095883ea4ec6e0d60e0600b9de6ed7be2..f853730cee4fad2f3a5711e38918c65d
 +        return level().purpurConfig.snifferAlwaysDropExp;
 +    }
 +    // Plazma end - Add missing purpur configuration options
-     // Purpur end
- 
+     // Purpur end - Make entity breeding times configurable
      @Override
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index 692261880d05daa75fc53dde31d0f2b95dc52746..9f542e4f0077a6abc89fdec1a4bf3e8f40203b2a 100644
+index 74011f1ab7e48490109ad93d658bba216eef9e80..5313f4c1ca76b120c0eb6beddc993b562f79344e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 @@ -151,6 +151,23 @@ public class Warden extends Monster implements VibrationSystem {
-         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
-         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
+         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
+         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
      }
 +
 +    // Plazma start - Add missing purpur configuration options
@@ -154,9 +154,18 @@ index 692261880d05daa75fc53dde31d0f2b95dc52746..9f542e4f0077a6abc89fdec1a4bf3e8f
 +        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level().purpurConfig.wardenMaxHealth);
 +    }
 +    // Plazma end - Add missing purpur configuration options
-     // Purpur end
+     // Purpur end - Ridables
  
      @Override
+@@ -305,7 +322,7 @@ public class Warden extends Monster implements VibrationSystem {
+         ProfilerFiller gameprofilerfiller = Profiler.get();
+ 
+         gameprofilerfiller.push("wardenBrain");
+-        if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
++        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Plazma - Add missing Purpur configurations
+         this.getBrain().tick(world, this);
+         gameprofilerfiller.pop();
+         super.customServerAiStep(world);
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractChestBoat.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractChestBoat.java
 index 1f4cc08e84a23213bb9786ea09ad77caeec2d336..f888f1dd2e3c228b0a370fe920b63d547bbba571 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractChestBoat.java
@@ -180,7 +189,7 @@ index 1f4cc08e84a23213bb9786ea09ad77caeec2d336..f888f1dd2e3c228b0a370fe920b63d54
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 097f3c34d244b89e7dd9f8b6f2a3d8fdc67b36dc..3f4c94aada930e55dfe6a2dd6f3bfb51b2276b0d 100644
+index f29059798c9dc642187b4939dd917ee15cbe120d..7a482099a69759659038e10632e7dd4626c187a1 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -331,6 +331,7 @@ public class PurpurConfig {
@@ -200,10 +209,10 @@ index 097f3c34d244b89e7dd9f8b6f2a3d8fdc67b36dc..3f4c94aada930e55dfe6a2dd6f3bfb51
          org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
          enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2198477c174f89fdaece5ffef8b40c8096a9c9a9..046af5afaf3e234fb7d14c4a9ae183cda8cb0b0c 100644
+index 43ad38dadfe14b3dd0565c536b276eb3f9dbd813..474bab426175d8dece524faeffd8977a6e1bb074 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1133,7 +1133,13 @@ public class PurpurWorldConfig {
+@@ -1144,7 +1144,13 @@ public class PurpurWorldConfig {
      public boolean allayControllable = true;
      public double allayMaxHealth = 20.0D;
      public double allayScale = 1.0D;
@@ -217,7 +226,7 @@ index 2198477c174f89fdaece5ffef8b40c8096a9c9a9..046af5afaf3e234fb7d14c4a9ae183cd
          allayRidable = getBoolean("mobs.allay.ridable", allayRidable);
          allayRidableInWater = getBoolean("mobs.allay.ridable-in-water", allayRidableInWater);
          allayControllable = getBoolean("mobs.allay.controllable", allayControllable);
-@@ -1288,7 +1294,13 @@ public class PurpurWorldConfig {
+@@ -1299,7 +1305,13 @@ public class PurpurWorldConfig {
      public double camelMovementSpeedMin = 0.09D;
      public double camelMovementSpeedMax = 0.09D;
      public int camelBreedingTicks = 6000;
@@ -231,7 +240,7 @@ index 2198477c174f89fdaece5ffef8b40c8096a9c9a9..046af5afaf3e234fb7d14c4a9ae183cd
          camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater);
          camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin);
          camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax);
-@@ -1740,7 +1752,15 @@ public class PurpurWorldConfig {
+@@ -1764,7 +1776,15 @@ public class PurpurWorldConfig {
      public boolean frogControllable = true;
      public float frogRidableJumpHeight = 0.65F;
      public int frogBreedingTicks = 6000;
@@ -247,7 +256,7 @@ index 2198477c174f89fdaece5ffef8b40c8096a9c9a9..046af5afaf3e234fb7d14c4a9ae183cd
          frogRidable = getBoolean("mobs.frog.ridable", frogRidable);
          frogRidableInWater = getBoolean("mobs.frog.ridable-in-water", frogRidableInWater);
          frogControllable = getBoolean("mobs.frog.controllable", frogControllable);
-@@ -2752,7 +2772,13 @@ public class PurpurWorldConfig {
+@@ -2776,7 +2796,13 @@ public class PurpurWorldConfig {
      public double snifferMaxHealth = 14.0D;
      public double snifferScale = 1.0D;
      public int snifferBreedingTicks = 6000;
@@ -261,7 +270,7 @@ index 2198477c174f89fdaece5ffef8b40c8096a9c9a9..046af5afaf3e234fb7d14c4a9ae183cd
          snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable);
          snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater);
          snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable);
-@@ -2860,7 +2886,15 @@ public class PurpurWorldConfig {
+@@ -2884,7 +2910,15 @@ public class PurpurWorldConfig {
      public boolean tadpoleRidable = false;
      public boolean tadpoleRidableInWater = true;
      public boolean tadpoleControllable = true;
@@ -277,7 +286,7 @@ index 2198477c174f89fdaece5ffef8b40c8096a9c9a9..046af5afaf3e234fb7d14c4a9ae183cd
          tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable);
          tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater);
          tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable);
-@@ -3088,7 +3122,15 @@ public class PurpurWorldConfig {
+@@ -3116,7 +3150,15 @@ public class PurpurWorldConfig {
      public boolean wardenRidable = false;
      public boolean wardenRidableInWater = true;
      public boolean wardenControllable = true;

patches/server/0016-Apply-various-optimizations.patch

@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 27 Sep 2023 22:11:15 +0900
-Subject: [PATCH] Apply various optimizations
-
-[REFERENCE PATCHES]
-Akarin - Swaps the predicate order of collision
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d6d9dd17750d7028e13aad539e7b65a7561d9f4b..ae264484f99227f5535c428ebda4860fc8abcc72 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2342,8 +2342,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-     public void playerTouch(Player player) {}
- 
-     public void push(Entity entity) {
-+        if (entity.noPhysics || this.noPhysics) return; // Plazma - Swaps the predicate order of collision
-         if (!this.isPassengerOfSameVehicle(entity)) {
--            if (!entity.noPhysics && !this.noPhysics) {
-+            //if (!entity.noPhysics && !this.noPhysics) { // Plazma - Swaps the predicate order of collision
-                 if (this.level.paperConfig().collisions.onlyPlayersCollide && !(entity instanceof ServerPlayer || this instanceof ServerPlayer)) return; // Paper - Collision option for requiring a player participant
-                 double d0 = entity.getX() - this.getX();
-                 double d1 = entity.getZ() - this.getZ();
-@@ -2371,8 +2372,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-                         entity.push(d0, 0.0D, d1);
-                     }
-                 }
--
--            }
-+            //} // Plazma - Swaps the predicate order of collision
-         }
-     }
- 

patches/server/0017-Do-not-load-chunks-to-spawn-phantom.patch

@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 5 Nov 2023 12:07:06 +0900
-Subject: [PATCH] Do not load chunks to spawn phantom
-
-
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-index 27eb9a365006884c85603dc6d9dd8eee009c98b3..958a48d05aba8e500c7b19a466dcca6fea8a8bcc 100644
---- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-@@ -70,6 +70,7 @@ public class PhantomSpawner implements CustomSpawner {
- 
-                                     if (randomsource.nextInt(j) >= world.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper - Ability to control player's insomnia and phantoms
-                                         BlockPos blockposition1 = blockposition.above(20 + randomsource.nextInt(15)).east(-10 + randomsource.nextInt(21)).south(-10 + randomsource.nextInt(21));
-+                                        if (!world.plazmaConfig().entity.phantom.loadChunksToSpawn && !world.hasChunkAt(blockposition1)) continue; // Plazma - Do not load chunks to spawn phantom
-                                         BlockState iblockdata = world.getBlockState(blockposition1);
-                                         FluidState fluid = world.getFluidState(blockposition1);
- 
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index e50118ec7a4c00bd367ca6c740214c53b0d60fc9..4d204a0dc976d96c98764092c8461b0e2b920fc1 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-@@ -31,6 +31,7 @@ public class WorldConfigurations extends ConfigurationPart {
-         public Phantom phantom;
-         public class Phantom extends ConfigurationPart {
- 
-+            public boolean loadChunksToSpawn = !OPTIMIZE;
- 
-         }
- 

patches/server/0018-Add-option-to-disable-moved-to-quickly-check-for-spe.patch

@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 5 Nov 2023 12:16:14 +0900
-Subject: [PATCH] Add option to disable moved to quickly check for specific
- players
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 61b19f52aeb371abdd29f41291099f35a9b4c258..dcb0a4461a2fca964e4d8390401e463648ed3351 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1694,7 +1694,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         }
-     }
- 
-+    // Plazma start - Add option to bypass moved to quickly check
-     private boolean shouldCheckPlayerMovement(boolean elytra) {
-+        return (!this.player.getBukkitEntity().hasPermission("plazma.bypass-moved-to-quickly-check") || !(org.plazmamc.plazma.configurations.GlobalConfiguration.get().player.checkSpectatorMovedToQuickly && this.player.isSpectator())) && shouldCheckPlayerMovement0(elytra);
-+    }
-+
-+    private boolean shouldCheckPlayerMovement0(boolean elytra) {
-+    // Plazma end - Add option to bypass moved to quickly check
-         if (this.isSingleplayerOwner()) {
-             return false;
-         } else if (this.player.isChangingDimension()) {
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index b3fccda131e51b03b1617b028f8d7488db342f24..6fd1f1c859a6e6cea780d9dfa9a2770d59ddfd04 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -27,6 +27,7 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public Player player;
-     public class Player extends ConfigurationPart {
- 
-+        public boolean checkSpectatorMovedToQuickly = !OPTIMIZE;
- 
-     }
- 

patches/server/0020-Configurable-entity-sensor-tick.patch

@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Mon, 6 Nov 2023 11:36:08 +0900
-Subject: [PATCH] Configurable entity sensor tick
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index ff9d23aef4658922692b43a859bd83632fe23612..8e5ad4cd6c8f61661b87dc96ba914c0bcd199879 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -949,10 +949,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
-         //ProfilerFiller gameprofilerfiller = Profiler.get(); // Purpur
- 
-         //gameprofilerfiller.push("sensing"); // Purpur
--        this.sensing.tick();
-+        //this.sensing.tick(); // Plazma - moved down
-         //gameprofilerfiller.pop(); // Purpur
-         int i = this.tickCount + this.getId();
- 
-+        if (i % this.level().plazmaConfig().entity.sensorTick == 0) this.sensing.tick(); // Plazma - Configurable entity sensor tick
-         if (i % 2 != 0 && this.tickCount > 1) {
-             //gameprofilerfiller.push("targetSelector"); // Purpur
-             this.targetSelector.tickRunningGoals(false);
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index 4d204a0dc976d96c98764092c8461b0e2b920fc1..33bcfec86f83ce6e0ec17436ad38da8aeced48be 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-@@ -28,6 +28,8 @@ public class WorldConfigurations extends ConfigurationPart {
-     public Entity entity;
-     public class Entity extends ConfigurationPart {
- 
-+        public int sensorTick = 1;
-+
-         public Phantom phantom;
-         public class Phantom extends ConfigurationPart {
- 

patches/server/0025-Improve-SwingTime-ticking.patch

@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 10 Jan 2024 18:11:03 +0900
-Subject: [PATCH] Improve SwingTime ticking
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d3d4e7e01afeb4ace5e487f9ef0926fd987c8ca4..6f999fcba6f72f2d31835c4ce5f6c17a69b0537c 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2772,6 +2772,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-     }
- 
-     protected void updateSwingTime() {
-+        if (!this.swinging && this.swingTime == 0) return; // Plazma - Improve SwingTime ticking
-         int i = this.getCurrentSwingDuration();
- 
-         if (this.swinging) {

patches/server/0027-Use-Akair-s-flag-when-running-the-test-server-with-g.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Mon, 6 May 2024 12:25:59 +0900
-Subject: [PATCH] Use Akair's flag when running the test server with gradle
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 787d3447f328c59deabb6b07b9f72f9fbce71cba..487cf26f8cf38b3df58df5591c029b4a7d639c00 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -151,7 +151,7 @@ fun TaskContainer.registerRunTask(
-         languageVersion.set(JavaLanguageVersion.of(21))
-         vendor.set(JvmVendorSpec.JETBRAINS)
-     })
--    jvmArgs("-DPlazma.DevelopmentEnvironment", "-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods") // Plazma - Always agree EULA on development mode
-+    jvmArgs("-DPlazma.DevelopmentEnvironment", "--add-modules=jdk.incubator.vector", "-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods", "-XX:+UseG1GC", "-XX:+ParallelRefProcEnabled", "-XX:MaxGCPauseMillis=200", "-XX:+UnlockExperimentalVMOptions", "-XX:+DisableExplicitGC", "-XX:+AlwaysPreTouch", "-XX:G1HeapWastePercent=5", "-XX:G1MixedGCCountTarget=4", "-XX:InitiatingHeapOccupancyPercent=15", "-XX:G1MixedGCLiveThresholdPercent=90", "-XX:G1RSetUpdatingPauseTimePercent=5", "-XX:SurvivorRatio=32", "-XX:+PerfDisableSharedMem", "-XX:MaxTenuringThreshold=1", "-Dusing.aikars.flags=https://mcflags.emc.gs", "-Daikars.new.flags=true", "-XX:G1NewSizePercent=40", "-XX:G1MaxNewSizePercent=50", "-XX:G1HeapRegionSize=16M", "-XX:G1ReservePercent=15") // Plazma - Always agree EULA on development mode; Use Akair's flag when running the test server with gradle
- 
-     if (rootProject.childProjects["test-plugin"] != null) {
-         val testPluginJar = rootProject.project(":test-plugin").tasks.jar.flatMap { it.archiveFile }

patches/server/0028-Use-Plazma-logo-instead-if-server-favicon-doesn-t-ex.patch

@@ -1,77 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Mon, 6 May 2024 13:40:48 +0900
-Subject: [PATCH] Use Plazma logo instead if server favicon doesn't exist
-
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c462d9f0c1997f8c49f6e80c4c87124d2a2533d8..e12225ae784f52e13195a759ccb19f8b4a909927 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1622,29 +1622,32 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     }
- 
-     private Optional<ServerStatus.Favicon> loadStatusIcon() {
--        Optional<Path> optional = Optional.of(this.getFile("server-icon.png")).filter((path) -> {
--            return Files.isRegularFile(path, new LinkOption[0]);
--        }).or(() -> {
--            return this.storageSource.getIconFile().filter((path) -> {
--                return Files.isRegularFile(path, new LinkOption[0]);
--            });
--        });
--
--        return optional.flatMap((path) -> {
--            try {
--                BufferedImage bufferedimage = ImageIO.read(path.toFile());
--
--                Preconditions.checkState(bufferedimage.getWidth() == 64, "Must be 64 pixels wide");
--                Preconditions.checkState(bufferedimage.getHeight() == 64, "Must be 64 pixels high");
--                ByteArrayOutputStream bytearrayoutputstream = new ByteArrayOutputStream();
--
--                ImageIO.write(bufferedimage, "PNG", bytearrayoutputstream);
--                return Optional.of(new ServerStatus.Favicon(bytearrayoutputstream.toByteArray()));
--            } catch (Exception exception) {
--                MinecraftServer.LOGGER.error("Couldn't load server icon", exception);
--                return Optional.empty();
--            }
--        });
-+        // Plazma start - Use Plazma logo instead if server favicon doesn't exist
-+        @Nullable File file = Optional.of(this.getFile("server-icon.png").toAbsolutePath()).filter(Files::isRegularFile)
-+            .or(() -> this.storageSource.getIconFile().filter(Files::isRegularFile)).map(Path::toFile).orElse(null);
-+        try (
-+            java.io.InputStream stream = (file != null)
-+                ? new java.io.FileInputStream(file)
-+                : (
-+                    org.plazmamc.plazma.Options.VANILLA_ICO
-+                        ? null
-+                        : MinecraftServer.class.getResourceAsStream("logo.png")
-+                )
-+        ) {
-+            if (stream == null) return Optional.empty();
-+            if (file == null && !org.plazmamc.plazma.Options.VANILLA_ICO)
-+                LOGGER.info("No server icon found, using the logo instead.");
-+            BufferedImage bufferedimage = ImageIO.read(stream);
-+            Preconditions.checkState(bufferedimage.getWidth() == 64, "Must be 64 pixels wide");
-+            Preconditions.checkState(bufferedimage.getHeight() == 64, "Must be 64 pixels high");
-+            ByteArrayOutputStream bytearrayoutputstream = new ByteArrayOutputStream();
-+            ImageIO.write(bufferedimage, "PNG", bytearrayoutputstream);
-+            return Optional.of(new ServerStatus.Favicon(bytearrayoutputstream.toByteArray()));
-+        } catch (Exception exception) {
-+            MinecraftServer.LOGGER.error("Couldn't load server icon", exception);
-+            return Optional.empty();
-+        }
-+        // Plazma end - Use Plazma logo instead if server favicon doesn't exist
-     }
- 
-     public Optional<Path> getWorldScreenshotFile() {
-diff --git a/src/main/java/org/plazmamc/plazma/Options.java b/src/main/java/org/plazmamc/plazma/Options.java
-index 063b71b3043a69a90130a81686b6a5f1e5f22fd1..e7092aeb5abce5aa5f9bd434adc6acd4e43dec13 100644
---- a/src/main/java/org/plazmamc/plazma/Options.java
-+++ b/src/main/java/org/plazmamc/plazma/Options.java
-@@ -10,5 +10,6 @@ public interface Options {
-     boolean AGGRESSIVE = getBoolean("Plazma.aggressiveOptimize") && !NO_OPTIMIZE;
-     boolean VANILLAIZE = getBoolean("Plazma.vanillaize") && !AGGRESSIVE;
-     boolean USE_VANILLA = getBoolean("Plazma.useVanillaConfiguration") && !AGGRESSIVE && NO_OPTIMIZE;
-+    boolean VANILLA_ICO = getBoolean("Plazma.useVanillaFavicon");
- 
- }

patches/server/0032-Suppress-errors-from-dirty-attributes.patch

@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Fri, 25 Oct 2024 19:26:15 +0900
-Subject: [PATCH] Suppress errors from dirty attributes
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index bf5633f387e268191e2a33be2dcec6c514c0766f..4653b25a818ebe18980864e6e450bd0ab8db99e9 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1377,7 +1377,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
-     }
- 
-     private void refreshDirtyAttributes() {
--        Set<AttributeInstance> set = this.getAttributes().getAttributesToUpdate();
-+        Set<AttributeInstance> attr = this.getAttributes().getAttributesToUpdate(); // Plazma - Suppress errors from dirty attributes
-+        final Set<AttributeInstance> set = level().plazmaConfig().entity.suppressErrorsFromDirtyAttributes ? java.util.Collections.synchronizedSet(attr) : attr; // Plazma - Suppress errors from dirty attributes
-         Iterator iterator = set.iterator();
- 
-         while (iterator.hasNext()) {
-@@ -1386,7 +1387,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-             this.onAttributeUpdated(attributemodifiable.getAttribute());
-         }
- 
--        set.clear();
-+        attr.clear(); // Plazma - Suppress errors from dirty attributes
-     }
- 
-     protected void onAttributeUpdated(Holder<Attribute> attribute) {
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index 0618db9893eda1fac0da6b771cc4d456b247d237..bd795efde3b34371e54df881be39891a344d44fd 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-@@ -29,6 +29,7 @@ public class WorldConfigurations extends ConfigurationPart {
-     public class Entity extends ConfigurationPart {
- 
-         public int sensorTick = 1;
-+        public boolean suppressErrorsFromDirtyAttributes = OPTIMIZE;
- 
-         public Phantom phantom;
-         public class Phantom extends ConfigurationPart {

patches/server/0036-Optimize-advancement-criteria-triggering.patch

@@ -1,73 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 27 Oct 2024 00:16:25 +0900
-Subject: [PATCH] Optimize advancement criteria triggering
-
-Based on bigenergy/achievements-optimizer
-Copyright (C) 2024 bigenergy, Licensed under MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-diff --git a/src/main/java/net/minecraft/advancements/critereon/InventoryChangeTrigger.java b/src/main/java/net/minecraft/advancements/critereon/InventoryChangeTrigger.java
-index ebbad97920df3d1645637e646a98e16cb04d361e..a149c949a042e1d1e504d9f5ce0bfa6df92db2fc 100644
---- a/src/main/java/net/minecraft/advancements/critereon/InventoryChangeTrigger.java
-+++ b/src/main/java/net/minecraft/advancements/critereon/InventoryChangeTrigger.java
-@@ -22,7 +22,21 @@ public class InventoryChangeTrigger extends SimpleCriterionTrigger<InventoryChan
-         return InventoryChangeTrigger.TriggerInstance.CODEC;
-     }
- 
-+    // Plazma start - Optimize advancement criteria triggering
-+    public static int idleTick;
-+    private int ticksSkipped;
-+
-+    private boolean shouldTick() {
-+        if (++this.ticksSkipped <= idleTick) return false;
-+
-+        this.ticksSkipped = 0;
-+        return true;
-+    }
-+    // Plazma end - Optimize advancement criteria triggering
-+
-     public void trigger(ServerPlayer player, Inventory inventory, ItemStack stack) {
-+        if (idleTick > 0 && !this.shouldTick()) return; // Plazma - Optimize advancement criteria triggering
-+
-         int i = 0;
-         int j = 0;
-         int k = 0;
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 4a73bffae1531b42a2718cbe620fe2fc53139c45..cac12ad98eb0fa4dcc1b0f7f21d1eadd14ef7456 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -128,4 +128,16 @@ public class GlobalConfiguration extends ConfigurationPart {
- 
-     }
- 
-+    public Advancements advancements;
-+    public class Advancements extends ConfigurationPart {
-+
-+        int criteriaTriggerIdleTick = OPTIMIZE ? 5 : 0;
-+
-+        @PostProcess
-+        void post() {
-+            net.minecraft.advancements.critereon.InventoryChangeTrigger.idleTick = this.criteriaTriggerIdleTick;
-+        }
-+
-+    }
-+
- }

patches/server/0037-Configurable-water-flowing-speed.patch

@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 27 Oct 2024 13:48:01 +0900
-Subject: [PATCH] Configurable water flowing speed
-
-
-diff --git a/src/main/java/net/minecraft/world/level/material/WaterFluid.java b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
-index 1e741f36b79585f33abe413beafe00cf5205d54f..028aea6640356ba80f5d682e3cc03b7f82f5b9c7 100644
---- a/src/main/java/net/minecraft/world/level/material/WaterFluid.java
-+++ b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
-@@ -123,7 +123,7 @@ public abstract class WaterFluid extends FlowingFluid {
- 
-     @Override
-     public int getTickDelay(LevelReader world) {
--        return 5;
-+        return world.getWorldBorder().world.plazmaConfig().block.waterFlowingTick; // Plazma - Configurable water flowing speed
-     }
- 
-     @Override
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index 619cd178f6954563f7cd1c94c9eb8cbd78f3289b..ef3dc8477b5547efa08a7fb60704f246e57fedfe 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-@@ -64,7 +64,9 @@ public class WorldConfigurations extends ConfigurationPart {
- 
-     public Block block;
-     public class Block extends ConfigurationPart {
--        
-+
-+        public int waterFlowingTick = 5;
-+
-         public Hopper hopper;
-         public class Hopper extends ConfigurationPart {
- 

patches/server/0038-cleanup-logs.patch

@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Thu, 31 Oct 2024 22:53:16 +0900
-Subject: [PATCH] cleanup logs
-
-
-diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index a056aa167887abef9e6d531a9edd2cda433567d2..dbd822604471e7405e350586ea0e294e0234cf06 100644
---- a/src/main/resources/log4j2.xml
-+++ b/src/main/resources/log4j2.xml
-@@ -7,7 +7,7 @@
-                 <LoggerNamePatternSelector defaultPattern="%highlightGUIError{[%d{HH:mm:ss} %level]: [%logger] %stripAnsi{%msg}%n%xEx{full}}">
-                     <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
-                     <!-- Disable prefix for various plugins that bypass the plugin logger -->
--                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE"
-+                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE,ca.spottedleaf."
-                                   pattern="%highlightGUIError{[%d{HH:mm:ss} %level]: %stripAnsi{%msg}%n%xEx{full}}" />
-                 </LoggerNamePatternSelector>
-             </PatternLayout>
-@@ -18,7 +18,7 @@
-                 <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %msg%n%xEx{full}}">
-                     <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
-                     <!-- Disable prefix for various plugins that bypass the plugin logger -->
--                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE"
-+                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE,ca.spottedleaf."
-                                   pattern="%highlightError{[%d{HH:mm:ss} %level]: %msg%n%xEx{full}}" />
-                 </LoggerNamePatternSelector>
-             </PatternLayout>
-@@ -28,7 +28,7 @@
-                 <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %stripAnsi{%msg}%n%xEx{full}">
-                     <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
-                     <!-- Disable prefix for various plugins that bypass the plugin logger -->
--                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE"
-+                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE,ca.spottedleaf."
-                                   pattern="[%d{HH:mm:ss}] [%t/%level]: %stripAnsi{%msg}%n%xEx{full}" />
-                 </LoggerNamePatternSelector>
-             </PatternLayout>

patches/server/0043-minor-code-improvements.patch

@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sat, 2 Nov 2024 15:10:12 +0900
-Subject: [PATCH] minor code improvements
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java b/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java
-index e5c5e20b0f2b2094faae2955a886f06ef6771eff..f19ab0a7daa671727675c2d03b3c77b287062f75 100644
---- a/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java
-@@ -100,8 +100,8 @@ public class EndGatewayBlock extends BaseEntityBlock implements Portal {
-             // Paper end - call EntityPortalEnterEvent
-             BlockEntity tileentity = world.getBlockEntity(pos);
- 
--            if (/*!world.isClientSide &&*/ tileentity instanceof TheEndGatewayBlockEntity) { // Plazma - Remove persist flag
--                TheEndGatewayBlockEntity tileentityendgateway = (TheEndGatewayBlockEntity) tileentity;
-+            if (/*!world.isClientSide &&*/ tileentity instanceof TheEndGatewayBlockEntity tileentityendgateway) { // Plazma - Remove persist flag // Plazma - minor code improvements
-+                //TheEndGatewayBlockEntity tileentityendgateway = (TheEndGatewayBlockEntity) tileentity; // Plazma - minor code improvements
- 
-                 if (!tileentityendgateway.isCoolingDown()) {
-                     // Purpur start

patches/server/0046-Option-to-use-better-RNG.patch

@@ -1,92 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Mon, 4 Nov 2024 15:20:40 +0900
-Subject: [PATCH] Option to use better RNG
-
-
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index e94ab488b4d7ef26021be3b97c71831eeef505f4..82ed63aa458b6b628be7163a6b1f1f47d1a69ce4 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -125,7 +125,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
-     public final Thread thread;
-     private final boolean isDebug;
-     private int skyDarken;
--    protected int randValue = RandomSource.create().nextInt();
-+    protected long randValue;
-     protected final int addend = 1013904223;
-     protected float oRainLevel;
-     public float rainLevel;
-@@ -134,7 +134,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
-     public final RandomSource random = RandomSource.create();
-     /** @deprecated */
-     @Deprecated
--    private final RandomSource threadSafeRandom = RandomSource.createThreadSafe();
-+    private final @Nullable RandomSource threadSafeRandom;
-     private final Holder<DimensionType> dimensionTypeRegistration;
-     public final WritableLevelData levelData;
-     //public final boolean isClientSide; // Plazma - Remove persist flag
-@@ -909,6 +909,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
-         this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
-         this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
-         this.plazmaConfig = plazmaWorldConfigurationCreator.apply(this.spigotConfig); // Plazma - Configurable Plazma
-+        this.randValue = plazmaConfig.misc.useBetterRandomAlgorithm ? RandomSource.create().nextLong() : RandomSource.create().nextInt(); // Plazma - Option to use better RNG
-+        this.threadSafeRandom = plazmaConfig.misc.useBetterRandomAlgorithm ? null : RandomSource.createThreadSafe(); // Plazma - Option to use better RNG
-         this.purpurConfig = new org.purpurmc.purpur.PurpurWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur
-         this.playerBreedingCooldowns = this.getNewBreedingCooldownCache(); // Purpur
-         this.generator = gen;
-@@ -1472,15 +1474,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
-     }
- 
-     public void playSound(@Nullable Player source, double x, double y, double z, SoundEvent sound, SoundSource category, float volume, float pitch) {
--        this.playSeededSound(source, x, y, z, sound, category, volume, pitch, this.threadSafeRandom.nextLong());
-+        long seed = this.threadSafeRandom == null ? this.randValue++ : this.threadSafeRandom.nextLong();
-+        this.playSeededSound(source, x, y, z, sound, category, volume, pitch, seed);
-     }
- 
-     public void playSound(@Nullable Player source, double x, double y, double z, Holder<SoundEvent> sound, SoundSource category, float volume, float pitch) {
--        this.playSeededSound(source, x, y, z, sound, category, volume, pitch, this.threadSafeRandom.nextLong());
-+        long seed = this.threadSafeRandom == null ? this.randValue++ : this.threadSafeRandom.nextLong();
-+        this.playSeededSound(source, x, y, z, sound, category, volume, pitch, seed);
-     }
- 
-     public void playSound(@Nullable Player source, Entity entity, SoundEvent sound, SoundSource category, float volume, float pitch) {
--        this.playSeededSound(source, entity, BuiltInRegistries.SOUND_EVENT.wrapAsHolder(sound), category, volume, pitch, this.threadSafeRandom.nextLong());
-+        long seed = this.threadSafeRandom == null ? this.randValue++ : this.threadSafeRandom.nextLong();
-+        this.playSeededSound(source, entity, BuiltInRegistries.SOUND_EVENT.wrapAsHolder(sound), category, volume, pitch, seed);
-     }
- 
-     public void playLocalSound(BlockPos pos, SoundEvent sound, SoundSource category, float volume, float pitch, boolean useDistance) {
-@@ -2047,8 +2052,19 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
-     public abstract RecipeAccess recipeAccess();
- 
-     public BlockPos getBlockRandomPos(int x, int y, int z, int l) {
-+        // Plazma start - Option to use better RNG
-+        if (this.threadSafeRandom == null) {
-+            this.randValue = (((long)(x ^ 16691) << 32 | ((z ^ 19391) & (1L << 32) - 1)) << 8 | ((this.randValue + 2319389831L) * 11 & 0xFF));
-+            long i1 = Long.reverse(randValue * randValue << 39);
-+            long i2 = Long.reverse(randValue * randValue << 41);
-+            long i3 = Long.reverse(randValue * randValue << 23);
-+
-+            return new BlockPos(x + ((int) i1 & 15), y + ((int) i2 & l), z + ((int) i3 & 15));
-+        }
-+        // Plazma end - Option to use better RNG
-+
-         this.randValue = this.randValue * 3 + 1013904223;
--        int i1 = this.randValue >> 2;
-+        int i1 = (int) (this.randValue >> 2); // Plazma - Option to use better RNG
- 
-         return new BlockPos(x + (i1 & 15), y + (i1 >> 16 & l), z + (i1 >> 8 & 15));
-     }
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index ef3dc8477b5547efa08a7fb60704f246e57fedfe..6b68ce9b5961cd298eaf2fca478cb8197f2128ee 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-@@ -22,6 +22,7 @@ public class WorldConfigurations extends ConfigurationPart {
-     public Miscellaneous misc;
-     public class Miscellaneous extends ConfigurationPart {
- 
-+        public boolean useBetterRandomAlgorithm = false;
- 
-     }
- 

patches/server/features/0012-Optimize-default-configurations.patch

@@ -8,11 +8,60 @@ Subject: [PATCH] Optimize default configurations
 - AkiraDevelopment/SimplyMC
 - YouHaveTrouble/minecraft-exploits-and-how-to-fix-them
 
+diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
+index c867796f6..ecced2072 100644
+--- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
++++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
+@@ -181,7 +222,7 @@ public class WorldConfiguration extends ConfigurationPart {
+             @MergeMap
+             public Reference2IntMap<MobCategory> spawnLimits = Util.make(new Reference2IntOpenHashMap<>(NaturalSpawner.SPAWNING_CATEGORIES.length), map -> Arrays.stream(NaturalSpawner.SPAWNING_CATEGORIES).forEach(mobCategory -> map.put(mobCategory, -1)));
+             @MergeMap
+-            public Map<MobCategory, DespawnRange> despawnRanges = Arrays.stream(MobCategory.values()).collect(Collectors.toMap(Function.identity(), category -> new DespawnRange(category.getNoDespawnDistance(), category.getDespawnDistance())));
++            public Map<MobCategory, DespawnRange> despawnRanges = Arrays.stream(MobCategory.values()).collect(Collectors.toMap(Function.identity(), category -> new DespawnRange(category.getNoDespawnDistance(), org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? (net.minecraft.server.MinecraftServer.getServer().server.getSimulationDistance() * 16) + 8 : category.getDespawnDistance()))); // Plazma - Optimize default configurations
+             @MergeMap
+             public Reference2IntMap<MobCategory> ticksPerSpawn = Util.make(new Reference2IntOpenHashMap<>(NaturalSpawner.SPAWNING_CATEGORIES.length), map -> Arrays.stream(NaturalSpawner.SPAWNING_CATEGORIES).forEach(mobCategory -> map.put(mobCategory, -1)));
+diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
+index 3ff4f092a59242a8cb930c084915a774db881652..66f797f5205b9b259cc6f6cfd710293fc73cdf59 100644
+--- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
++++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
+@@ -61,7 +61,7 @@ public class PufferfishConfig {
+ 		getString("info.version", "1.0");
+ 		setComment("info",
+ 				"Pufferfish Configuration",
+-				"Check out Pufferfish Host for maximum performance server hosting: https://pufferfish.host",
++				// "Check out Pufferfish Host for maximum performance server hosting: https://pufferfish.host", // Plazma - Sponsorblock
+ 				"Join our Discord for support: https://discord.gg/reZw4vQV9H",
+ 				"Download new builds at https://ci.pufferfish.host/job/Pufferfish");
+ 		
+@@ -216,7 +216,7 @@ public class PufferfishConfig {
+     public static int maxProjectileLoadsPerTick;
+     public static int maxProjectileLoadsPerProjectile;
+     private static void projectileLoading() {
+-        maxProjectileLoadsPerTick = getInt("projectile.max-loads-per-tick", 10, "Controls how many chunks are allowed", "to be sync loaded by projectiles in a tick.");
++        maxProjectileLoadsPerTick = getInt("projectile.max-loads-per-tick", plazma.Config.optimize() ? 8 : 10, "Controls how many chunks are allowed", "to be sync loaded by projectiles in a tick."); // Plazma - Optimize default configurations
+         maxProjectileLoadsPerProjectile = getInt("projectile.max-loads-per-projectile", 10, "Controls how many chunks a projectile", "can load in its lifetime before it gets", "automatically removed.");
+ 
+         setComment("projectile", "Optimizes projectile settings");
+@@ -230,12 +230,12 @@ public class PufferfishConfig {
+     public static int activationDistanceMod;
+ 
+     private static void dynamicActivationOfBrains() throws IOException {
+-        dearEnabled = getBoolean("dab.enabled", "activation-range.enabled", false); // Purpur - Fix pufferfish issues
++        dearEnabled = getBoolean("dab.enabled", "activation-range.enabled", plazma.Config.optimize()); // Purpur - Fix pufferfish issues // Plazma - Optimize default configurations
+         startDistance = getInt("dab.start-distance", "activation-range.start-distance", 12,
+                 "This value determines how far away an entity has to be",
+                 "from the player to start being effected by DEAR.");
+         startDistanceSquared = startDistance * startDistance;
+-        maximumActivationPrio = getInt("dab.max-tick-freq", "activation-range.max-tick-freq", 20,
++        maximumActivationPrio = getInt("dab.max-tick-freq", "activation-range.max-tick-freq", plazma.Config.optimize() ? 7 : 8, // Plazma - Optimize default configurations
+                 "This value defines how often in ticks, the furthest entity",
+                 "will get their pathfinders and behaviors ticked. 20 = 1s");
+         activationDistanceMod = getInt("dab.activation-dist-mod", "activation-range.activation-dist-mod", 8,
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index cbd0f2c6636b8ae332f20a3cb763b06855dfe795..3b636760f32b9b5b277edb15782d6206567e012f 100644
+index 088b8fe5d144807f4da1e85b2fa34dfd21286f8c..8c3c7987a269733a0f530e8f22c3f1a005de21ac 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -147,7 +147,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -148,7 +148,7 @@ public class GlobalConfiguration extends ConfigurationPart {
  
      public class Watchdog extends ConfigurationPart {
          public int earlyWarningEvery = 5000;
@@ -21,7 +70,7 @@ index cbd0f2c6636b8ae332f20a3cb763b06855dfe795..3b636760f32b9b5b277edb15782d6206
      }
  
      public SpamLimiter spamLimiter;
-@@ -189,7 +189,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -188,7 +188,7 @@ public class GlobalConfiguration extends ConfigurationPart {
      public Commands commands;
  
      public class Commands extends ConfigurationPart {
@@ -30,7 +79,7 @@ index cbd0f2c6636b8ae332f20a3cb763b06855dfe795..3b636760f32b9b5b277edb15782d6206
          public boolean fixTargetSelectorTagCompletion = true;
          public boolean timeCommandAffectsAllWorlds = false;
      }
-@@ -255,7 +255,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -253,7 +253,7 @@ public class GlobalConfiguration extends ConfigurationPart {
          public BookSize bookSize;
  
          public class BookSize extends ConfigurationPart {
@@ -39,7 +88,7 @@ index cbd0f2c6636b8ae332f20a3cb763b06855dfe795..3b636760f32b9b5b277edb15782d6206
              public double totalMultiplier = 0.98D; // TODO this should probably be merged into the above inner class
          }
          public boolean resolveSelectorsInBooks = false;
-@@ -266,7 +266,15 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -264,7 +264,15 @@ public class GlobalConfiguration extends ConfigurationPart {
      public class PacketLimiter extends ConfigurationPart {
          public Component kickMessage = Component.translatable("disconnect.exceeded_packet_rate", NamedTextColor.RED);
          public PacketLimit allPackets = new PacketLimit(7.0, 500.0, PacketLimit.ViolateAction.KICK);
@@ -56,7 +105,7 @@ index cbd0f2c6636b8ae332f20a3cb763b06855dfe795..3b636760f32b9b5b277edb15782d6206
  
          @ConfigSerializable
          public record PacketLimit(@Required double interval, @Required double maxPacketRate, ViolateAction action) {
-@@ -334,7 +342,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -332,7 +340,7 @@ public class GlobalConfiguration extends ConfigurationPart {
                  executor.setMaximumPoolSize(_chatExecutorMaxSize);
              }
          }
@@ -66,10 +115,10 @@ index cbd0f2c6636b8ae332f20a3cb763b06855dfe795..3b636760f32b9b5b277edb15782d6206
          public boolean loadPermissionsYmlBeforePlugins = true;
          @Constraints.Min(4)
 diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-index b7428b8c287980941eaa5c5d1f1d321955277a09..b6f818d568bdf32c32685e163ba1588c7a8e153d 100644
+index 82210667376fd466d5d4cdcb56b62f6165bd5cde..3c6e9ec236bfd851700ce7fae2599b725ec899eb 100644
 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-@@ -100,12 +100,32 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -103,12 +103,32 @@ public class WorldConfiguration extends ConfigurationPart {
  
          public class AntiXray extends ConfigurationPart {
              public boolean enabled = false;
@@ -105,7 +154,7 @@ index b7428b8c287980941eaa5c5d1f1d321955277a09..b6f818d568bdf32c32685e163ba1588c
                  //<editor-fold desc="Anti-Xray Hidden Blocks" defaultstate="collapsed">
                  Blocks.COPPER_ORE,
                  Blocks.DEEPSLATE_COPPER_ORE,
-@@ -132,7 +152,28 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -135,7 +155,28 @@ public class WorldConfiguration extends ConfigurationPart {
                  Blocks.ENDER_CHEST
                  //</editor-fold>
              );
@@ -135,7 +184,7 @@ index b7428b8c287980941eaa5c5d1f1d321955277a09..b6f818d568bdf32c32685e163ba1588c
          }
      }
  
-@@ -154,14 +195,14 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -157,14 +198,14 @@ public class WorldConfiguration extends ConfigurationPart {
          public ArmorStands armorStands;
  
          public class ArmorStands extends ConfigurationPart {
@@ -153,7 +202,7 @@ index b7428b8c287980941eaa5c5d1f1d321955277a09..b6f818d568bdf32c32685e163ba1588c
          }
  
          public Sniffer sniffer;
-@@ -406,7 +447,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -415,7 +456,7 @@ public class WorldConfiguration extends ConfigurationPart {
      public class Environment extends ConfigurationPart {
          public boolean disableThunder = false;
          public boolean disableIceAndSnow = false;
@@ -162,7 +211,7 @@ index b7428b8c287980941eaa5c5d1f1d321955277a09..b6f818d568bdf32c32685e163ba1588c
          public boolean disableExplosionKnockback = false;
          public boolean generateFlatBedrock = false;
          public FrostedIce frostedIce;
-@@ -462,7 +503,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -471,7 +512,7 @@ public class WorldConfiguration extends ConfigurationPart {
      public Fixes fixes;
  
      public class Fixes extends ConfigurationPart {
@@ -171,7 +220,7 @@ index b7428b8c287980941eaa5c5d1f1d321955277a09..b6f818d568bdf32c32685e163ba1588c
          public boolean disableUnloadedChunkEnderpearlExploit = false;
          public boolean preventTntFromMovingInWater = false;
          public boolean splitOverstackedLoot = true;
-@@ -490,9 +531,9 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -499,9 +540,9 @@ public class WorldConfiguration extends ConfigurationPart {
      public class Collisions extends ConfigurationPart {
          public boolean onlyPlayersCollide = false;
          public boolean allowVehicleCollisions = true;
@@ -183,7 +232,7 @@ index b7428b8c287980941eaa5c5d1f1d321955277a09..b6f818d568bdf32c32685e163ba1588c
          public boolean allowPlayerCrammingDamage = false;
      }
  
-@@ -500,18 +541,41 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -509,18 +550,41 @@ public class WorldConfiguration extends ConfigurationPart {
  
      public class Chunks extends ConfigurationPart {
          public AutosavePeriod autoSaveInterval = AutosavePeriod.def();
@@ -233,7 +282,7 @@ index b7428b8c287980941eaa5c5d1f1d321955277a09..b6f818d568bdf32c32685e163ba1588c
          });
          public boolean flushRegionsOnSave = false;
      }
-@@ -526,9 +590,9 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -535,9 +599,9 @@ public class WorldConfiguration extends ConfigurationPart {
      public TickRates tickRates;
  
      public class TickRates extends ConfigurationPart {
@@ -245,7 +294,7 @@ index b7428b8c287980941eaa5c5d1f1d321955277a09..b6f818d568bdf32c32685e163ba1588c
          public int wetFarmland = 1;
          public int dryFarmland = 1;
          public Table<EntityType<?>, String, Integer> sensor = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "secondarypoisensor", 40));
-@@ -562,9 +626,9 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -571,9 +635,9 @@ public class WorldConfiguration extends ConfigurationPart {
  
      public class Misc extends ConfigurationPart {
          public int lightQueueSize = 20;
@@ -270,10 +319,10 @@ index 24763d3d270c29c95e0b3e85111145234f660a62..80ddc627e02e3c749e6b074afa93d357
      }
  
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 3978c93a847c859c70446a6d6157fdb49c0bc74c..a4ef13e8b91dcc4bea7b49c004af085357aba6ad 100644
+index fc378b08c10c7f670be93d52937c7642b986ed0d..9a436132faa04efbf25d8be9d5488e13f2111dac 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -164,7 +164,7 @@ public class Main {
+@@ -166,7 +166,7 @@ public class Main {
                  File configFile = (File) optionset.valueOf("bukkit-settings");
                  YamlConfiguration configuration = YamlConfiguration.loadConfiguration(configFile);
                  configuration.options().copyDefaults(true);
@@ -283,7 +332,7 @@ index 3978c93a847c859c70446a6d6157fdb49c0bc74c..a4ef13e8b91dcc4bea7b49c004af0853
  
                  File commandFile = (File) optionset.valueOf("commands-settings");
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index 568141881ffb26b425be452c79ecc146821ba1d9..067f91dd019be40cb09f8fa78cae587429488201 100644
+index 8f7e922ceca286b1a590181c301fbe9bff55c024..3dd5c7441bb300ca17d717af37edbefb89db4b2f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
 @@ -132,14 +132,14 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
@@ -315,10 +364,10 @@ index 568141881ffb26b425be452c79ecc146821ba1d9..067f91dd019be40cb09f8fa78cae5874
          this.enableJmxMonitoring = this.get("enable-jmx-monitoring", false);
          this.enableStatus = this.get("enable-status", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d76e487529dd5661753a91230c9ebab5814f79d1..47fa401e484fc3ebc6b66013c225bc1bb20f00a9 100644
+index 090cb821a43ccfea21a990580e47b592df9d030f..4177a12d333925dd7f3422861847119f344a441b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -437,7 +437,7 @@ public final class CraftServer implements Server {
+@@ -449,7 +449,7 @@ public final class CraftServer implements Server {
  
          this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
          this.configuration.options().copyDefaults(true);
@@ -359,7 +408,7 @@ index 09053b4ccf268fd204c81dbb8d4f10fa9edcad5f..93f67f125b3674e645cfdae27e579e12
              #### ENGLISH ####
              This is the %s configuration file for Plazma.
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 95cd1156766895546ef5574b33a60806bff08fa2..097f3c34d244b89e7dd9f8b6f2a3d8fdc67b36dc 100644
+index 7690441b5059ae6c7ca8519875ea8a515c5c5e93..f29059798c9dc642187b4939dd917ee15cbe120d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -244,7 +244,7 @@ public class PurpurConfig {
@@ -381,10 +430,10 @@ index 95cd1156766895546ef5574b33a60806bff08fa2..097f3c34d244b89e7dd9f8b6f2a3d8fd
      private static void networkSettings() {
          useUPnP = getBoolean("settings.network.upnp-port-forwarding", useUPnP);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 742a46ef95a5e46e9c338cedcecaf008a7108c58..2198477c174f89fdaece5ffef8b40c8096a9c9a9 100644
+index 0d5a0e14cbaacc63eeced78a6c28cc64ad918522..43ad38dadfe14b3dd0565c536b276eb3f9dbd813 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -422,7 +422,7 @@ public class PurpurWorldConfig {
+@@ -426,7 +426,7 @@ public class PurpurWorldConfig {
      public boolean idleTimeoutTargetPlayer = true;
      public String playerDeathExpDropEquation = "expLevel * 7";
      public int playerDeathExpDropMax = 100;
@@ -393,7 +442,7 @@ index 742a46ef95a5e46e9c338cedcecaf008a7108c58..2198477c174f89fdaece5ffef8b40c80
      public boolean teleportOnNetherCeilingDamage = false;
      public boolean totemOfUndyingWorksInInventory = false;
      public boolean playerFixStuckPortal = false;
-@@ -3243,7 +3243,7 @@ public class PurpurWorldConfig {
+@@ -3271,7 +3271,7 @@ public class PurpurWorldConfig {
      public boolean zombieJockeyOnlyBaby = true;
      public double zombieJockeyChance = 0.05D;
      public boolean zombieJockeyTryExistingChickens = true;

patches/server/features/0013-Add-an-option-to-apply-the-configuration-to-the-vani.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Add an option to apply the configuration to the vanilla
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 3b636760f32b9b5b277edb15782d6206567e012f..6d0f1448a1546cdaf81335b47e3bc9e361095545 100644
+index 8c3c7987a269733a0f530e8f22c3f1a005de21ac..20def77109eb9cd98a7677e73b4316544be86283 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -87,7 +87,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -88,7 +88,7 @@ public class GlobalConfiguration extends ConfigurationPart {
              public Component flyingVehicle = Component.translatable("multiplayer.disconnect.flying");
          }
  
@@ -19,10 +19,10 @@ index 3b636760f32b9b5b277edb15782d6206567e012f..6d0f1448a1546cdaf81335b47e3bc9e3
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 47fa401e484fc3ebc6b66013c225bc1bb20f00a9..7e87db1f99888c206400add17f5ea514de242e9f 100644
+index 4177a12d333925dd7f3422861847119f344a441b..15527e902484496a6804c879d1de589bed3f8713 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -437,7 +437,19 @@ public final class CraftServer implements Server {
+@@ -449,7 +449,19 @@ public final class CraftServer implements Server {
  
          this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
          this.configuration.options().copyDefaults(true);

patches/server/features/0025-Add-entity-spawn-deadlock-timer.patch

@@ -7,7 +7,7 @@ Subject: [PATCH] Add entity spawn deadlock timer
 - AbsolemJackdaw/FixMySpawnR
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index bb4411cfdf1bc7adc12c2f918d2eec830299f38b..357d484029fe338bea4f5770d13ccfc0dce4432e 100644
+index 79a8e5dd1d189c4eaf93999925ea0790eb6ce368..ac3b0f95926aba8e99375f74dfca9d83ca1fbd57 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -50,6 +50,8 @@ public abstract class BaseSpawner {
@@ -61,7 +61,7 @@ index bb4411cfdf1bc7adc12c2f918d2eec830299f38b..357d484029fe338bea4f5770d13ccfc0
          return nbt;
      }
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index b047af738236be3400d07d46c663017ed39b6f96..6c9c28ae5fbe62ba647e7790acccb377d1e62490 100644
+index a371893777a2c2d1de22e7d52f2fd3f55b82d74d..d366e8755ba91c329164c16659f6b07245577fba 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 @@ -51,6 +51,14 @@ public class WorldConfigurations extends ConfigurationPart {

patches/server/features/0031-Implement-FreedomChat.patch

@@ -20,10 +20,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 4e583dde426f8345fb931be6135a1427ed635ab2..808cf602ee77d8156b032fb1a2bd1f5a3a2c2579 100644
+index 32ebee3620b5ec1ff57b92a581fb2d7f5dfe17cf..214bd8084182ebd0d36cf9ddfac4411a5dce78be 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -684,6 +684,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -697,6 +697,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          // Paper start - Add setting for proxy online mode status
          return dedicatedserverproperties.enforceSecureProfile
              && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()
@@ -32,7 +32,7 @@ index 4e583dde426f8345fb931be6135a1427ed635ab2..808cf602ee77d8156b032fb1a2bd1f5a
          // Paper end - Add setting for proxy online mode status
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 62a6fec0f4bf0f2a70740ba5cfd386857abe9531..503716bfa3d54c46534738d4209ef1a8ab50f7c3 100644
+index 459eea7dae68afdf7e1443f29f6f8d0c68668b74..aead28160c7a5067340ec80a833eafcab1817d67 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -135,6 +135,7 @@ public abstract class PlayerList {
@@ -52,10 +52,10 @@ index 62a6fec0f4bf0f2a70740ba5cfd386857abe9531..503716bfa3d54c46534738d4209ef1a8
          player.loadGameTypes((CompoundTag) optional.orElse(null)); // CraftBukkit - decompile error
          ServerGamePacketListenerImpl playerconnection = new ServerGamePacketListenerImpl(this.server, connection, player, clientData);
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index af0ca8b0470c0e66cbc4cc0331219b71d0fa429f..97a2aebc9ba946e4532c66553d9a2e7e7b3139f2 100644
+index 5450d2a784511122a8236d30485f6b1f798822f3..a0b1239e302f0366743949a895a0539348817077 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -29,6 +29,15 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -45,6 +45,15 @@ public class GlobalConfiguration extends ConfigurationPart {
  
          public boolean checkSpectatorMovedToQuickly = !OPTIMIZE;
  

patches/server/features/0035-Implement-Rail-Optimazition.patch

@@ -354,7 +354,7 @@ index bd14c08defe8afc5ceca59d16a5b1dbad178f594..99dc44c569b6003b271ce2ea3f80cb19
          boolean flag1 = world.hasNeighborSignal(pos) || this.findPoweredRailSignal(world, pos, state, true, 0) || this.findPoweredRailSignal(world, pos, state, false, 0);
  
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index bd795efde3b34371e54df881be39891a344d44fd..619cd178f6954563f7cd1c94c9eb8cbd78f3289b 100644
+index 9cfab16b9cdf40ccb709c0af66c406954560c0ef..0e27e4a1f767842d1dcd2ed235a6a45f120bf32e 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 @@ -72,6 +72,13 @@ public class WorldConfigurations extends ConfigurationPart {
@@ -370,4 +370,4 @@ index bd795efde3b34371e54df881be39891a344d44fd..619cd178f6954563f7cd1c94c9eb8cbd
 +
      }
  
- }
+     public Item item;

patches/server/features/0037-Configurable-RandomSource-factory-provider.patch

@@ -240,10 +240,10 @@ index f1e0d3d7b1f458fcce83cf67762a16309123cdcb..6a8d5948f127ea87a0b4554ece4ad2c4
  
      public boolean isIgnoreEntities() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9a104c48bb1a92655b1feaab3e01a3be6ec7d942..06a5dcfd89d43d9b09ac5932a75a33fc5c0216e6 100644
+index 5d7af6c1ec557d2a2813b87a64b8c8a99d2f87e0..deddf588826dda9b15beff3acf20be56837d240b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -287,7 +287,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -289,7 +289,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      }
      // Paper end
  

patches/server/features/0043-Process-pathfinding-asynchronously.patch

@@ -464,12 +464,12 @@ index 0000000000000000000000000000000000000000..3456f38d381643b0461669b0b5fec6bf
 +
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
-index 3d7578605812021bc84b99d4db1672a682d897ad..58feaaed5e301eb402dab24e6f155beb865fa5ee 100644
+index 273ba657926ce72a7c82861e880a82bf7f322a0b..f90a14860e4c9a11a972edc3cea011e1cf67b4eb 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
-@@ -76,6 +76,35 @@ public class AcquirePoi {
-                                     io.papermc.paper.util.PoiAccess.findNearestPoiPositions(poiManager, poiPredicate, predicate2, entity.blockPosition(), world.purpurConfig.villagerAcquirePoiSearchRadius, world.purpurConfig.villagerAcquirePoiSearchRadius*world.purpurConfig.villagerAcquirePoiSearchRadius, PoiManager.Occupancy.HAS_SPACE, false, 5, poiposes);
-                                     Set<Pair<Holder<PoiType>, BlockPos>> set = new java.util.HashSet<>(poiposes);
+@@ -94,6 +94,35 @@ public class AcquirePoi {
+                                         }
+                                     }
                                      // Paper end - optimise POI access
 +                                    // Plazma start - Process Pathfinding Asynchronously
 +                                    if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().entity.asyncPathProcess.enabled) {
@@ -653,23 +653,23 @@ index 6802e0c4d331c7125114dd86409f6a110465ab82..0b8973765bcaa77e70ac7afe5b6a99ab
                                          if (path != null && path.canReach()) {
                                              BlockPos blockPos = path.getTarget();
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/DoorInteractGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/DoorInteractGoal.java
-index 74aca307b4ebffe4e33c4fca3e07c23ca87622ac..a1c99a611c9b0c99d851393c668fe02c5a31536f 100644
+index 2846790fcd00788cf0284c348161ee1aee415f13..069e27041434c11ae5235ccb0e17544fe4a14e12 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/DoorInteractGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/DoorInteractGoal.java
 @@ -56,7 +56,7 @@ public abstract class DoorInteractGoal extends Goal {
          } else {
              GroundPathNavigation groundPathNavigation = (GroundPathNavigation)this.mob.getNavigation();
              Path path = groundPathNavigation.getPath();
--            if (path != null && !path.isDone() && groundPathNavigation.canOpenDoors()) {
-+            if (path != null && path.isProcessed() && !path.isDone() && groundPathNavigation.canOpenDoors()) { // Plazma - Process Pathfinding asynchronously
+-            if (path != null && !path.isDone()) {
++            if (path != null && path.isProcessed() && !path.isDone()) { // Plazma - Process Pathfinding asynchronously
                  for (int i = 0; i < Math.min(path.getNextNodeIndex() + 2, path.getNodeCount()); i++) {
                      Node node = path.getNode(i);
                      this.doorPos = new BlockPos(node.x, node.y + 1, node.z);
 diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/AmphibiousPathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/AmphibiousPathNavigation.java
-index ee38e447a810094d2253b85714b74282a4b4c2bc..8361b230963469d564d6280414ea083e975f9cf7 100644
+index 29b852c3262c9cd0d2c77a93c01a386a2c184742..8361b230963469d564d6280414ea083e975f9cf7 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/AmphibiousPathNavigation.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/AmphibiousPathNavigation.java
-@@ -12,12 +12,26 @@ public class AmphibiousPathNavigation extends PathNavigation {
+@@ -12,11 +12,26 @@ public class AmphibiousPathNavigation extends PathNavigation {
          super(mob, world);
      }
  
@@ -687,7 +687,7 @@ index ee38e447a810094d2253b85714b74282a4b4c2bc..8361b230963469d564d6280414ea083e
      @Override
      protected PathFinder createPathFinder(int range) {
          this.nodeEvaluator = new AmphibiousNodeEvaluator(false);
-         this.nodeEvaluator.setCanPassDoors(true);
++        this.nodeEvaluator.setCanPassDoors(true);
 +        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().entity.asyncPathProcess.enabled)
 +            return new PathFinder(this.nodeEvaluator, range, GENERATOR);
          return new PathFinder(this.nodeEvaluator, range);
@@ -697,10 +697,10 @@ index ee38e447a810094d2253b85714b74282a4b4c2bc..8361b230963469d564d6280414ea083e
      @Override
      protected boolean canUpdatePath() {
 diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
-index a3e0c5af4cc9323c02e88e768cbda9e46854aea1..d68e97084ba6bc97312fc5b62ffcb6e6b21b056e 100644
+index 2bd66da93227d4e4fc2ec4df47ae94b17f4d39d3..ee395676b5eb14cd24b7251a83be7154d71b7b20 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
-@@ -16,12 +16,26 @@ public class FlyingPathNavigation extends PathNavigation {
+@@ -16,11 +16,26 @@ public class FlyingPathNavigation extends PathNavigation {
          super(entity, world);
      }
  
@@ -713,12 +713,12 @@ index a3e0c5af4cc9323c02e88e768cbda9e46854aea1..d68e97084ba6bc97312fc5b62ffcb6e6
 +            evaluator.setCanFloat(features.canFloat());
 +            evaluator.setCanWalkOverFences(features.canWalkOverFences());
 +            return evaluator;
-+        };
++       };
 +
      @Override
      protected PathFinder createPathFinder(int range) {
          this.nodeEvaluator = new FlyNodeEvaluator();
-         this.nodeEvaluator.setCanPassDoors(true);
++        this.nodeEvaluator.setCanPassDoors(true);
 +        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().entity.asyncPathProcess.enabled)
 +            return new PathFinder(this.nodeEvaluator, range, GENERATOR);
          return new PathFinder(this.nodeEvaluator, range);
@@ -727,7 +727,7 @@ index a3e0c5af4cc9323c02e88e768cbda9e46854aea1..d68e97084ba6bc97312fc5b62ffcb6e6
  
      @Override
      protected boolean canMoveDirectly(Vec3 origin, Vec3 target) {
-@@ -50,6 +64,7 @@ public class FlyingPathNavigation extends PathNavigation {
+@@ -49,6 +64,7 @@ public class FlyingPathNavigation extends PathNavigation {
              this.recomputePath();
          }
  
@@ -736,10 +736,10 @@ index a3e0c5af4cc9323c02e88e768cbda9e46854aea1..d68e97084ba6bc97312fc5b62ffcb6e6
              if (this.canUpdatePath()) {
                  this.followThePath();
 diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
-index f73b559b8e60859020f762dab88b67b8c912bf8f..d218604447afbde96dc4af33ba90a87617a13ed4 100644
+index 2796df7af365c452b28373adfd7daf1d6730bac5..921b0f792fbb3e7a0bb0275d8494a19830a08eae 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
-@@ -24,10 +24,23 @@ public class GroundPathNavigation extends PathNavigation {
+@@ -24,11 +24,25 @@ public class GroundPathNavigation extends PathNavigation {
          super(entity, world);
      }
  
@@ -753,18 +753,20 @@ index f73b559b8e60859020f762dab88b67b8c912bf8f..d218604447afbde96dc4af33ba90a876
 +            evaluator.setCanWalkOverFences(features.canWalkOverFences());
 +            return evaluator;
 +        };
-+    // Plazma end - Process pathfinding asynchronously
 +
      @Override
      protected PathFinder createPathFinder(int range) {
          this.nodeEvaluator = new WalkNodeEvaluator();
-         this.nodeEvaluator.setCanPassDoors(true);
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().entity.asyncPathProcess.enabled) return new PathFinder(this.nodeEvaluator, range, GENERATOR); // Plazma - Process pathfinding asynchronously
++        this.nodeEvaluator.setCanPassDoors(true);
++        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().entity.asyncPathProcess.enabled) return new PathFinder(this.nodeEvaluator, range, GENERATOR);
          return new PathFinder(this.nodeEvaluator, range);
      }
++    // Plazma end - Process pathfinding asynchronously
  
+     @Override
+     protected boolean canUpdatePath() {
 diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
-index c7c6385c71c5bfae5818976008feececf5890654..b54c7b274c5c4eefc8c0170b89a6c7d7d02f5f08 100644
+index 48c0de870a5bbf647309e69361dfb10ab56c65ab..99e31c8e8488ce7138c5385575cbbabe0bd7394e 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
 @@ -168,6 +168,7 @@ public abstract class PathNavigation {
@@ -778,7 +780,7 @@ index c7c6385c71c5bfae5818976008feececf5890654..b54c7b274c5c4eefc8c0170b89a6c7d7
 @@ -195,6 +196,23 @@ public abstract class PathNavigation {
              PathNavigationRegion pathNavigationRegion = new PathNavigationRegion(this.level, blockPos.offset(-i, -i, -i), blockPos.offset(i, i, i));
              Path path = this.pathFinder.findPath(pathNavigationRegion, this.mob, positions, followRange, distance, this.maxVisitedNodesMultiplier);
-             //profilerFiller.pop(); // Purpur
+             profilerFiller.pop();
 +            // Plazma start - Process pathfinding asynchronously
 +            if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().entity.asyncPathProcess.enabled) {
 +                if (!positions.isEmpty()) this.targetPos = positions.iterator().next();
@@ -836,10 +838,10 @@ index c7c6385c71c5bfae5818976008feececf5890654..b54c7b274c5c4eefc8c0170b89a6c7d7
              Vec3 vec3 = new Vec3(((double)node.x + this.mob.getX()) / 2.0, ((double)node.y + this.mob.getY()) / 2.0, ((double)node.z + this.mob.getZ()) / 2.0);
              return pos.closerToCenterThan(vec3, (double)(this.path.getNodeCount() - this.path.getNextNodeIndex()));
 diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/WaterBoundPathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/WaterBoundPathNavigation.java
-index 0446ac540d8509a653abe1a8bc10f52fb43d6ae1..77c10a3e9570f53ce73dacb39cb86a00202e6ce6 100644
+index 943c9944ae17fa7cd72e437cce61beaf3fc9505e..77c10a3e9570f53ce73dacb39cb86a00202e6ce6 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/WaterBoundPathNavigation.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/WaterBoundPathNavigation.java
-@@ -15,10 +15,23 @@ public class WaterBoundPathNavigation extends PathNavigation {
+@@ -15,11 +15,23 @@ public class WaterBoundPathNavigation extends PathNavigation {
          super(entity, world);
      }
  
@@ -859,6 +861,7 @@ index 0446ac540d8509a653abe1a8bc10f52fb43d6ae1..77c10a3e9570f53ce73dacb39cb86a00
      protected PathFinder createPathFinder(int range) {
          this.allowBreaching = this.mob.getType() == EntityType.DOLPHIN;
          this.nodeEvaluator = new SwimNodeEvaluator(this.allowBreaching);
+-        this.nodeEvaluator.setCanPassDoors(false);
 +        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().entity.asyncPathProcess.enabled) return new PathFinder(this.nodeEvaluator, range, GENERATOR); // Plazma - Process pathfinding asynchronously
          return new PathFinder(this.nodeEvaluator, range);
      }
@@ -894,10 +897,10 @@ index 9104d7010bda6f9f73b478c11490ef9c53f76da2..a53950a6e4cb2e672b6f130461fa6306
              // Paper end - optimise POI access
              if (path != null && path.canReach()) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 6c4cab8cabdd27b6dbd97a408a588f4ef9684654..32a1bb3ea64099c4583607ee246b8cadb77c4d44 100644
+index ba0b72e648fad219d7b42f5d489b53ec41046826..d83f75719a3be1b5b2c544d89b63a4df420c73d2 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -1206,7 +1206,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -1243,7 +1243,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
                          } else {
                              Bee.this.pathfindRandomlyTowards(Bee.this.hivePos);
                          }
@@ -906,7 +909,7 @@ index 6c4cab8cabdd27b6dbd97a408a588f4ef9684654..32a1bb3ea64099c4583607ee246b8cad
                          boolean flag = this.pathfindDirectlyTowards(Bee.this.hivePos);
  
                          if (!flag) {
-@@ -1265,7 +1265,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -1302,7 +1302,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
              } else {
                  Path pathentity = Bee.this.navigation.getPath();
  
@@ -916,10 +919,10 @@ index 6c4cab8cabdd27b6dbd97a408a588f4ef9684654..32a1bb3ea64099c4583607ee246b8cad
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-index 62991c7d1c4d62669adeb30b56c94b0e7d998ab2..2077ccca3f6f942ec7daa06759ce0532b11a00a5 100644
+index 05e5bb907edb77f2479b29d6e4a15ae446ab0620..963e55584c741a3a3f903f465d897c7ecbf5cd4d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-@@ -505,10 +505,23 @@ public class Frog extends Animal implements VariantHolder<Holder<FrogVariant>> {
+@@ -508,9 +508,23 @@ public class Frog extends Animal implements VariantHolder<Holder<FrogVariant>> {
              return nodeType != PathType.WATER_BORDER && super.canCutCorner(nodeType);
          }
  
@@ -938,16 +941,16 @@ index 62991c7d1c4d62669adeb30b56c94b0e7d998ab2..2077ccca3f6f942ec7daa06759ce0532
          @Override
          protected PathFinder createPathFinder(int range) {
              this.nodeEvaluator = new Frog.FrogNodeEvaluator(true);
-             this.nodeEvaluator.setCanPassDoors(true);
++            this.nodeEvaluator.setCanPassDoors(true);
 +            if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().entity.asyncPathProcess.enabled) return new PathFinder(this.nodeEvaluator, range, GENERATOR); // Plazma - Process pathfinding asynchronously
              return new PathFinder(this.nodeEvaluator, range);
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index de3d91891000c599950e31da595c254a3b421e7a..a73d7a1ea1ef7a98a114b7d10de6b2946c092f76 100644
+index 902b4aff751a0f2a4fb8569eb2d88b7ceec7c40f..3235ea771c58ce9c09457a812416346341375613 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-@@ -308,7 +308,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
+@@ -309,7 +309,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
  
      protected boolean closeToNextPos() {
          Path path = this.getNavigation().getPath();
@@ -957,10 +960,10 @@ index de3d91891000c599950e31da595c254a3b421e7a..a73d7a1ea1ef7a98a114b7d10de6b294
              if (blockPos != null) {
                  double d = this.distanceToSqr((double)blockPos.getX(), (double)blockPos.getY(), (double)blockPos.getZ());
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-index d414158e1222f9a4f73a33abcf96f994aee4efde..dec0fd7d0b704c20df03b3c17fae1af921217e11 100644
+index 1cee20de1b691a92bee625a877e0ee9769e30b0b..ec871c81817ee82fa7b4ff929693b5ba045d35fb 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-@@ -610,10 +610,23 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
+@@ -613,9 +613,23 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
              super(entity, world);
          }
  
@@ -979,19 +982,19 @@ index d414158e1222f9a4f73a33abcf96f994aee4efde..dec0fd7d0b704c20df03b3c17fae1af9
          @Override
          protected PathFinder createPathFinder(int range) {
              this.nodeEvaluator = new WalkNodeEvaluator();
-             this.nodeEvaluator.setCanPassDoors(true);
++            this.nodeEvaluator.setCanPassDoors(true);
 +            if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().entity.asyncPathProcess.enabled) return new PathFinder(this.nodeEvaluator, range, GENERATOR); // Plazma - Process pathfinding asynchronously
              return new PathFinder(this.nodeEvaluator, range);
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index bcc1f2e8ad66eb826617f17d98fb43649fc8deb2..421a255dcb9843b34e8b0e39b65ee9b1bbd3ed0d 100644
+index 771e1b5ecc1803079bbb9e4233c616cb3075470e..839a5550a6d613abf4567b32b5f1a04700d6ccf4 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-@@ -636,6 +636,15 @@ public class Warden extends Monster implements VibrationSystem {
+@@ -637,6 +637,15 @@ public class Warden extends Monster implements VibrationSystem {
+             @Override
              protected PathFinder createPathFinder(int range) {
                  this.nodeEvaluator = new WalkNodeEvaluator();
-                 this.nodeEvaluator.setCanPassDoors(true);
 +                // Plazma start - Process pathfinding asynchonously
 +                if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().entity.asyncPathProcess.enabled)
 +                    return new PathFinder(this.nodeEvaluator, range, GroundPathNavigation.GENERATOR) {
@@ -1026,11 +1029,11 @@ index d9d0fff9962131808d54cca20f209df50b8e4af1..420dd323790e72aa12c942d31a94bcb8
          public void write(FriendlyByteBuf buf) {
              buf.writeCollection(this.targetNodes, (bufx, node) -> node.writeToStream(bufx));
 diff --git a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
-index f1aa182d7cc0ffac23ddb1f77335c61ca9f6f720..bc98944d37d5eb96a58092c31d7cb108249b7701 100644
+index cc7d94144e39f7dace7b569b4567def98396e8f9..95e71c471904fc54003180632dc85398ae06d241 100644
 --- a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
 +++ b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
-@@ -17,6 +17,7 @@ import net.minecraft.core.BlockPos;
- //import net.minecraft.util.profiling.metrics.MetricCategory; // Plazma - Completely remove Mojang's Profiler
+@@ -17,6 +17,7 @@ import net.minecraft.util.profiling.ProfilerFiller;
+ import net.minecraft.util.profiling.metrics.MetricCategory;
  import net.minecraft.world.entity.Mob;
  import net.minecraft.world.level.PathNavigationRegion;
 +import dev.kaiijumc.kaiiju.path.*; // Plazma - Process pathfinding asynchronously
@@ -1083,9 +1086,9 @@ index f1aa182d7cc0ffac23ddb1f77335c61ca9f6f720..bc98944d37d5eb96a58092c31d7cb108
 -    @Nullable
 -    // Paper start - Perf: remove streams and optimize collection
 -    private Path findPath(Node startNode, List<Map.Entry<Target, BlockPos>> positions, float followRange, int distance, float rangeMultiplier) {
--        //ProfilerFiller profilerFiller = Profiler.get(); // Purpur
--        //profilerFiller.push("find_path"); // Purpur
--        //profilerFiller.markForCharting(MetricCategory.PATH_FINDING); // Purpur
+-        ProfilerFiller profilerFiller = Profiler.get();
+-        profilerFiller.push("find_path");
+-        profilerFiller.markForCharting(MetricCategory.PATH_FINDING);
 -        // Set<Target> set = positions.keySet();
 -        startNode.g = 0.0F;
 -        startNode.h = this.getBestH(startNode, positions); // Paper - optimize collection
@@ -1187,7 +1190,7 @@ index f1aa182d7cc0ffac23ddb1f77335c61ca9f6f720..bc98944d37d5eb96a58092c31d7cb108
 +        } finally {
 +            this.nodeEvaluator.done();
          }
--        //profilerFiller.pop(); // Purpur
+-        profilerFiller.pop();
 -        return best;
 -        // Paper end - Perf: remove streams and optimize collection
      }
@@ -1298,10 +1301,10 @@ index 1c83926923f50fb4da1a83dc91614c20a831555f..aec2d0f9a957be65d031957dbff874d8
  
          Command.broadcastCommandMessage(sender, text("Successfully reloaded Plazma configuration files.", NamedTextColor.GREEN));
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index cac12ad98eb0fa4dcc1b0f7f21d1eadd14ef7456..ab4ff76efbe4077691a0fde4043160ecbc4bc7dc 100644
+index 8914159c17b3c8b0114e88c5317df5f17b05e5d6..92de32ee00bc9c4e8750773bca95a9cf5fbae067 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -70,6 +70,26 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -86,6 +86,26 @@ public class GlobalConfiguration extends ConfigurationPart {
      public class Entity extends ConfigurationPart {
  
  

patches/server/features/0044-Implement-alternative-noise-chunk-generator.patch

@@ -218,10 +218,10 @@ index 0e6dfe2635ea5f5e410049b05f94f5083b2f18a4..584311a00c5037a6d5bc05b1261969aa
          return null;
      }
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index ab4ff76efbe4077691a0fde4043160ecbc4bc7dc..2e1cf5f79556250aa22df3ade66393fe6a947659 100644
+index 92de32ee00bc9c4e8750773bca95a9cf5fbae067..fbcbbba15e8f7f8ea812a75d807908925305cb29 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -45,6 +45,8 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -61,6 +61,8 @@ public class GlobalConfiguration extends ConfigurationPart {
      public WorldGeneration worldgen;
      public class WorldGeneration extends ConfigurationPart {
  
@@ -230,7 +230,7 @@ index ab4ff76efbe4077691a0fde4043160ecbc4bc7dc..2e1cf5f79556250aa22df3ade66393fe
          public LavaSea lavaSea;
          public class LavaSea extends ConfigurationPart {
  
-@@ -64,6 +66,11 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -80,6 +82,11 @@ public class GlobalConfiguration extends ConfigurationPart {
  
          }
  

patches/server/features/0045-Reduce-allocations.patch

@@ -95,7 +95,7 @@ index db92261a6cb3758391108361096417c61bc82cdc..70ffa0853e04bd1684a36621143c3656
  
      public SortedList(final E[] elements, final Comparator<? super E> comparator) {
 diff --git a/src/main/java/ca/spottedleaf/moonrise/common/misc/NearbyPlayers.java b/src/main/java/ca/spottedleaf/moonrise/common/misc/NearbyPlayers.java
-index bb44de17a37082e57f2292a4f470740be1d09b11..34c4d6cff702683d488a3ba0f59b513e279413af 100644
+index 7e440b4a46b040365df7317035e577d93e7d855d..fd30799510b8230e11de10376ff9f781262e8282 100644
 --- a/src/main/java/ca/spottedleaf/moonrise/common/misc/NearbyPlayers.java
 +++ b/src/main/java/ca/spottedleaf/moonrise/common/misc/NearbyPlayers.java
 @@ -156,7 +156,7 @@ public final class NearbyPlayers {
@@ -117,10 +117,10 @@ index bb44de17a37082e57f2292a4f470740be1d09b11..34c4d6cff702683d488a3ba0f59b513e
                  players.add(player);
                  return;
 diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java
-index b3c993a790fc3fab6a408c731deb297f74c959ce..c53ea30fe9282ae1bb26b48b8844ef1e0e890545 100644
+index d21ce54ebb5724c04eadf56a2cde701d5eeb5db2..31d61d0a252fadf26288ff8d3152ea4898c37edc 100644
 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java
 +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java
-@@ -387,7 +387,7 @@ public final class ChunkEntitySlices {
+@@ -378,7 +378,7 @@ public final class ChunkEntitySlices {
  
      private static final class BasicEntityList<E extends Entity> {
  
@@ -129,7 +129,7 @@ index b3c993a790fc3fab6a408c731deb297f74c959ce..c53ea30fe9282ae1bb26b48b8844ef1e
          private static final int DEFAULT_CAPACITY = 4;
  
          private E[] storage;
-@@ -398,7 +398,7 @@ public final class ChunkEntitySlices {
+@@ -389,7 +389,7 @@ public final class ChunkEntitySlices {
          }
  
          public BasicEntityList(final int cap) {
@@ -138,7 +138,7 @@ index b3c993a790fc3fab6a408c731deb297f74c959ce..c53ea30fe9282ae1bb26b48b8844ef1e
          }
  
          public boolean isEmpty() {
-@@ -410,7 +410,7 @@ public final class ChunkEntitySlices {
+@@ -401,7 +401,7 @@ public final class ChunkEntitySlices {
          }
  
          private void resize() {
@@ -165,10 +165,10 @@ index 58d9187adc188b693b6becc400f766e069bf1bf5..a3d186c80840fdb628a48181df219c46
      public ServerEntityLookup(final ServerLevel world, final LevelCallback<Entity> worldCallback) {
          super(world, worldCallback);
 diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkTaskScheduler.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkTaskScheduler.java
-index f3c453773e0413276935ca653b60bbe64fa4b169..1983a3802d96def1dbb53445ebf219290342cc29 100644
+index 67532b85073b7978254a0b04caadfe822679e61f..bebb2f9c07175900f6720af6a249394be6219ed1 100644
 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkTaskScheduler.java
 +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkTaskScheduler.java
-@@ -919,9 +919,10 @@ public final class ChunkTaskScheduler {
+@@ -938,9 +938,10 @@ public final class ChunkTaskScheduler {
          }
      }
  
@@ -194,7 +194,7 @@ index eafa4e6d55cd0f9314ac0f2b96a7f48fbb5e1a4c..19c55571d3478532845d87d0053e4100
      public static final record ChunkCompletion(ChunkAccess chunk, ChunkStatus genStatus) {};
      private static final VarHandle CHUNK_COMPLETION_ARRAY_HANDLE = ConcurrentUtil.getArrayHandle(ChunkCompletion[].class);
 diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/starlight/light/StarLightEngine.java b/src/main/java/ca/spottedleaf/moonrise/patches/starlight/light/StarLightEngine.java
-index 95218c6dc9ade3c0347f26564c9f319f0e88c102..2bcf46ade808cb9db05f07777adf36f19408b192 100644
+index ef40af5c6ac60fe00c05adcb664c811b28330819..097b9c5f8f81fdc547b379dcf5e68ddf6d7bbca4 100644
 --- a/src/main/java/ca/spottedleaf/moonrise/patches/starlight/light/StarLightEngine.java
 +++ b/src/main/java/ca/spottedleaf/moonrise/patches/starlight/light/StarLightEngine.java
 @@ -1094,6 +1094,7 @@ public abstract class StarLightEngine {
@@ -346,10 +346,10 @@ index 1e9873d7b258ce1f0b2437cb1e487157a16f6834..94f1337bb63a505641b66e6cbf0cc288
      public CrashReportCategory(String title) {
          this.title = title;
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index ccfe9ef24dce9f34613692adb13738d3ad0e7aac..c2c5606bd02598b011eb998b034b03f515b29331 100644
+index 38ffa1c4c204f73746c4b87127de92b631548eb1..47d5d23f3cc3a173785c0f4971f97b343ba328df 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
-@@ -576,7 +576,7 @@ public class Util {
+@@ -597,7 +597,7 @@ public class Util {
          } else if (futures.size() == 1) {
              return futures.get(0).thenApply(List::of);
          } else {
@@ -479,7 +479,7 @@ index a2920b8a9eff77d9c5d1d7f70ad3abdacba8f0fa..80a28985e072334d960fe5a674d9bb08
      protected CipherBase(Cipher cipher) {
          this.cipher = cipher;
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 56e47c5709c765943407d2065b25bd512d1f9388..902faff84d17d3a251745ceb7b047340fb7b5faa 100644
+index 8661c1b1cfe2b3db000e1f08814fd4409c4b7fab..26456c0980315d8e38b68630ffeaf657aa02b0a0 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -326,7 +326,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -609,10 +609,10 @@ index 8dd9375f2ad2c65a773a3195aeff1f977e09e7e0..89cfe5a4e1554dd722ca98ec8c896e85
      private ChunkMap getChunkMap() {
          return (ChunkMap)this.playerProvider;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b7f3ba9fe334362227c1c1624ad7922d624993f3..575fa1395477bad8e264f18648811b02376afe0b 100644
+index 25b646c973cc1d304b8adb3cef4cf443d459b489..df0f52ee12eeab816c8920d6844a284239143054 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1349,7 +1349,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1366,7 +1366,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
  
      public static List<Entity> getCurrentlyTickingEntities() {
          Entity ticking = currentlyTickingEntity.get();
@@ -622,7 +622,7 @@ index b7f3ba9fe334362227c1c1624ad7922d624993f3..575fa1395477bad8e264f18648811b02
          return ret;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index bb10892f33ba0d7fc3959debef1045073868f8b8..b717afedc81765b8990f04a6c8c3795c00b746f0 100644
+index ab6a7d20f5473d8bffa7f8d136c1d55f17bbfaff..dce1796f0a7dbc69596b0348f42fe8d5fec1d2fa 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -172,12 +172,12 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@@ -640,7 +640,7 @@ index bb10892f33ba0d7fc3959debef1045073868f8b8..b717afedc81765b8990f04a6c8c3795c
          }
          // Paper end - Validate usernames
          this.requestedUsername = packet.name();
-@@ -275,7 +275,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -266,7 +266,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
  
      @Override
      public void handleKey(ServerboundKeyPacket packet) {
@@ -649,7 +649,7 @@ index bb10892f33ba0d7fc3959debef1045073868f8b8..b717afedc81765b8990f04a6c8c3795c
  
          final String s;
  
-@@ -456,7 +456,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -447,7 +447,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
      @Override
      public void handleLoginAcknowledgement(ServerboundLoginAcknowledgedPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.server); // CraftBukkit
@@ -715,25 +715,25 @@ index a371f685534bf161f476ccea431fec6a80aca9c1..d2addf2453fa35779f0197f54a102e06
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 32a1bb3ea64099c4583607ee246b8cadb77c4d44..e7b79aa92afbee2c4f3b18fc30b36cb47fea357b 100644
+index d83f75719a3be1b5b2c544d89b63a4df420c73d2..f3b1671a815c953435bf49616ab7c35856bdc352 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -257,7 +257,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -261,7 +261,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
          this.goalSelector.addGoal(8, new Bee.BeeWanderGoal());
          this.goalSelector.addGoal(9, new FloatGoal(this));
-         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
+         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
 -        this.targetSelector.addGoal(1, (new Bee.BeeHurtByOtherGoal(this)).setAlertOthers(new Class[0]));
 +        this.targetSelector.addGoal(1, (new Bee.BeeHurtByOtherGoal(this)).setAlertOthers()); // Plazma - Reduce allocations
          this.targetSelector.addGoal(2, new Bee.BeeBecomeAngryTargetGoal(this));
          this.targetSelector.addGoal(3, new ResetUniversalAngerTargetGoal<>(this, true));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-index 0c085bc33a8f1a4ab299d9b6a13ac0f54c76b101..727e0d9fb297923088c6622f137b1e97807c1849 100644
+index 1c918dfcb8b3c05394fea6dcc50c5bfc48cb3634..24a05c3b18690656ce5305c0e4d118f635cc9b6a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-@@ -119,7 +119,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
+@@ -123,7 +123,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
          this.goalSelector.addGoal(8, new RandomLookAroundGoal(this));
-         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
+         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
          this.targetSelector.addGoal(1, new DefendVillageTargetGoal(this));
 -        this.targetSelector.addGoal(2, new HurtByTargetGoal(this, new Class[0]));
 +        this.targetSelector.addGoal(2, new HurtByTargetGoal(this)); // Plazma - Reduce allocations
@@ -741,23 +741,23 @@ index 0c085bc33a8f1a4ab299d9b6a13ac0f54c76b101..727e0d9fb297923088c6622f137b1e97
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Mob.class, 5, false, false, (entityliving, worldserver) -> {
              return entityliving instanceof Enemy && !(entityliving instanceof Creeper);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 5997c826baecbc291575662917dc2f86aae18343..ba3ff61e1accbe299a49bcc93b2cdbfeeafc55c6 100644
+index adeb06f913b53d802f03d3def1303e298fe589e4..d2b6ec6f1cbae2063240210695f73e96ed8c436a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-@@ -338,7 +338,7 @@ public class Panda extends Animal {
+@@ -342,7 +342,7 @@ public class Panda extends Animal {
          this.goalSelector.addGoal(13, new FollowParentGoal(this, 1.25D));
          this.goalSelector.addGoal(14, new WaterAvoidingRandomStrollGoal(this, 1.0D));
-         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
+         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
 -        this.targetSelector.addGoal(1, (new Panda.PandaHurtByTargetGoal(this, new Class[0])).setAlertOthers(new Class[0]));
 +        this.targetSelector.addGoal(1, (new Panda.PandaHurtByTargetGoal(this)).setAlertOthers()); // Plazma - Reduce allocations
      }
  
      public static AttributeSupplier.Builder createAttributes() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index 082004a11174ecd492da4a59de226bdd94da914c..c2b81c8c43fdd14dcf5347e6683636da5687830a 100644
+index 761745f759614c43426b1bdf7bc8ca7b5aff100a..777764b74ac6e809b4b353117a0f31299bb651e3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-@@ -458,7 +458,7 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
+@@ -462,7 +462,7 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
          if (variant == Rabbit.Variant.EVIL) {
              this.getAttribute(Attributes.ARMOR).setBaseValue(8.0D);
              this.goalSelector.addGoal(4, new MeleeAttackGoal(this, 1.4D, true));
@@ -767,11 +767,11 @@ index 082004a11174ecd492da4a59de226bdd94da914c..c2b81c8c43fdd14dcf5347e6683636da
              this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Wolf.class, true));
              this.getAttribute(Attributes.ATTACK_DAMAGE).addOrUpdateTransientModifier(new AttributeModifier(Rabbit.EVIL_ATTACK_POWER_MODIFIER, 5.0D, AttributeModifier.Operation.ADD_VALUE));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index d6953cc2cd43e740106983730b1ef4f0f8d532a0..2f448e3895d3e7c5c60c953c6302cb24656549fd 100644
+index 9f4681cb70f0e42e07968024cee010990644ba53..a736db8b5764a47511433887ff1db702179e9d59 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-@@ -247,7 +247,7 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
-         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
+@@ -252,7 +252,7 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
+         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
          this.targetSelector.addGoal(1, new OwnerHurtByTargetGoal(this));
          this.targetSelector.addGoal(2, new OwnerHurtTargetGoal(this));
 -        this.targetSelector.addGoal(3, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers());
@@ -780,7 +780,7 @@ index d6953cc2cd43e740106983730b1ef4f0f8d532a0..2f448e3895d3e7c5c60c953c6302cb24
          // this.targetSelector.addGoal(5, new NonTameRandomTargetGoal<>(this, Animal.class, false, Wolf.PREY_SELECTOR)); // Purpur - moved to updatePathfinders()
          this.targetSelector.addGoal(6, new NonTameRandomTargetGoal<>(this, Turtle.class, false, Turtle.BABY_ON_LAND_SELECTOR));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-index 61a939bdebeed51a839c93d31038e4395a9484c3..947c492f2350aa76bbf85e2679f6e3096444617c 100644
+index 634e11a1c279066c7bf682776344f1c829e061a4..502277270c38cfcbd686455552d2b54701774e5f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
 @@ -88,7 +88,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
@@ -807,38 +807,38 @@ index 48826eb0a960f7af6dd2ef184a8aed744a1d8f83..495a24d4e6705902c36032227bdfa359
      public static final EnderDragonPhase<DragonStrafePlayerPhase> STRAFE_PLAYER = create(DragonStrafePlayerPhase.class, "StrafePlayer");
      public static final EnderDragonPhase<DragonLandingApproachPhase> LANDING_APPROACH = create(DragonLandingApproachPhase.class, "LandingApproach");
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 7c862d730d8062303046519a9601c62fe284e1ba..8ef1beb34e4439a62be222a8ad7d2f58df6f328b 100644
+index 08bff1102179551eeeeed7f65aaa1ab501ca8683..91839fc6b8013c31d562c21670985d42747bfdce 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -258,7 +258,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
+@@ -260,7 +260,7 @@ public class WitherBoss extends Monster implements RangedAttackMob {
          this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 8.0F));
          this.goalSelector.addGoal(7, new RandomLookAroundGoal(this));
-         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
+         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
 -        this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[0]));
 +        this.targetSelector.addGoal(1, new HurtByTargetGoal(this)); // Plazma - Reduce allocations
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, LivingEntity.class, 0, false, false, WitherBoss.LIVING_ENTITY_SELECTOR));
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-index 4a389323d2ba15b282217ec54c52f5c278f79ff6..47d40d10c1b1514e6d56b994cc34b124b7fb5ce1 100644
+index 2ff72241928a1d07be936cd764e7408d202f39e0..334cc9474e0a81c34babffc22e25d52c6e2fbf17 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-@@ -81,7 +81,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+@@ -83,7 +83,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
          this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 8.0F));
          this.goalSelector.addGoal(6, new RandomLookAroundGoal(this));
-         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
+         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
 -        this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[0]));
 +        this.targetSelector.addGoal(1, new HurtByTargetGoal(this)); // Plazma - Reduce allocations
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 058ca0f7b85754950ddbb014958c1b90f15f8549..275e874a27afdb6b708d7edb8317f8b26f3e2711 100644
+index 7a6c3eb850e463a64bfc23c7d3c46ddabeeb251d..a346f13be03481311a18f3778fed6e0d4343d15e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -154,7 +154,7 @@ public class Creeper extends Monster {
+@@ -161,7 +161,7 @@ public class Creeper extends Monster {
          this.goalSelector.addGoal(6, new RandomLookAroundGoal(this));
-         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
+         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
          this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, true));
 -        this.targetSelector.addGoal(2, new HurtByTargetGoal(this, new Class[0]));
 +        this.targetSelector.addGoal(2, new HurtByTargetGoal(this)); // Plazma - Reduce allocations
@@ -846,12 +846,12 @@ index 058ca0f7b85754950ddbb014958c1b90f15f8549..275e874a27afdb6b708d7edb8317f8b2
  
      public static AttributeSupplier.Builder createAttributes() {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index fbf08c9041e07f49f1fc2f869ea2f5ba795bc7ff..1f9a24cc958675d4ad5d6fe9fd1ff515d0bdb4d2 100644
+index 017c86be270ae395be84f6bc30c9288af6278fb7..6a6e2856e8bd361880dcc91638f74f98fa9bf3b0 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -136,7 +136,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -137,7 +137,7 @@ public class EnderMan extends Monster implements NeutralMob {
          this.goalSelector.addGoal(11, new EnderMan.EndermanTakeBlockGoal(this));
-         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
+         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
          this.targetSelector.addGoal(1, new EnderMan.EndermanLookForPlayerGoal(this, this::isAngryAt));
 -        this.targetSelector.addGoal(2, new HurtByTargetGoal(this, new Class[0]));
 +        this.targetSelector.addGoal(2, new HurtByTargetGoal(this)); // Plazma - Reduce allocations
@@ -859,49 +859,49 @@ index fbf08c9041e07f49f1fc2f869ea2f5ba795bc7ff..1f9a24cc958675d4ad5d6fe9fd1ff515
          this.targetSelector.addGoal(4, new ResetUniversalAngerTargetGoal<>(this, false));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
-index 57158457f7d0e6a785df9fe19204d73d6b918e79..6326c74849b648622eda886a3adb0db45b8c750c 100644
+index fd292373f5f8bf6f5773d5eea1a7470e8eae4231..0aa7d7ceccf77fac4d43d6c2fc814e4b1aec4dd3 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
-@@ -90,7 +90,7 @@ public class Endermite extends Monster {
+@@ -94,7 +94,7 @@ public class Endermite extends Monster {
          this.goalSelector.addGoal(7, new LookAtPlayerGoal(this, Player.class, 8.0F));
          this.goalSelector.addGoal(8, new RandomLookAroundGoal(this));
-         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
+         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
 -        this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers());
 +        this.targetSelector.addGoal(1, (new HurtByTargetGoal(this)).setAlertOthers()); // Plazma - Reduce allocations
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
      }
  
 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 ece70d8303e563df416fc6703e6d7d2e23ee220a..25110321e35656e30017e7affceff1960991da37 100644
+index 78aec4acc84b228537f90172f2e4c346b665bc0b..6fec80e4b8911b5cf2849904f060e05042477117 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-@@ -89,7 +89,7 @@ public class Silverfish extends Monster {
+@@ -92,7 +92,7 @@ public class Silverfish extends Monster {
          this.goalSelector.addGoal(4, new MeleeAttackGoal(this, 1.0D, false));
          this.goalSelector.addGoal(5, new Silverfish.SilverfishMergeWithStoneGoal(this));
-         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
+         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
 -        this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers());
 +        this.targetSelector.addGoal(1, (new HurtByTargetGoal(this)).setAlertOthers()); // Plazma - Reduce allocations
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-index 651cc3297a86ff298f72b28a9fb623a0922adad8..3cb5d615833767122ae8b92294e44ffdf4ac21b3 100644
+index 49fa54b2d46c916d8f43c78080ea04eb37e60717..e4144c76d541158b2fc5699158608123802dd453 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-@@ -97,7 +97,7 @@ public class Spider extends Monster {
+@@ -100,7 +100,7 @@ public class Spider extends Monster {
          this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 8.0F));
          this.goalSelector.addGoal(6, new RandomLookAroundGoal(this));
-         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
+         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
 -        this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[0]));
 +        this.targetSelector.addGoal(1, new HurtByTargetGoal(this)); // Plazma - Reduce allocations
          this.targetSelector.addGoal(2, new Spider.SpiderTargetGoal<>(this, Player.class));
          this.targetSelector.addGoal(3, new Spider.SpiderTargetGoal<>(this, IronGolem.class));
      }
 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 94f2f27abdf5e48835bd134ac164a163fb78dc41..a3141438b5fa64318a1d515de296ce59e18b0ce9 100644
+index 68a928e42df03f111cfc000945a6020e484e6e7f..e5a8343542339036475e3d23958121e9d388fd44 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -170,7 +170,7 @@ public class Zombie extends Monster {
+@@ -174,7 +174,7 @@ public class Zombie extends Monster {
          this.goalSelector.addGoal(2, new ZombieAttackGoal(this, 1.0D, false));
          this.goalSelector.addGoal(6, new MoveThroughVillageGoal(this, 1.0D, true, 4, this::canBreakDoors));
          this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0D));
@@ -911,10 +911,10 @@ index 94f2f27abdf5e48835bd134ac164a163fb78dc41..a3141438b5fa64318a1d515de296ce59
          // Purpur start
          if ( this.level().spigotConfig.zombieAggressiveTowardsVillager ) this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false) { // Spigot
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index 8c3271dcc8c9aa58e2e007eba282c11e42b4e0c9..dd69e6efade81c6421f9cf0365d42092529cee63 100644
+index c0e611f3222ffacfbd0683c8c65b778f9012a2ad..15a18f3cc7f37860d8137d8f5f8d91834610e7a6 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-@@ -120,7 +120,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
+@@ -124,7 +124,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
      protected void addBehaviourGoals() {
          this.goalSelector.addGoal(2, new ZombieAttackGoal(this, 1.0D, false));
          this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0D));
@@ -960,10 +960,10 @@ index 2490a42c9c35c7e080279ef8566288a28362d167..34d6eaebfe03716c8cbbb5395024b0da
              String[] strings = new String[pattern.size() - l - k];
  
 diff --git a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-index cb19d28823a701720cd1998310dfc8cc8f50919f..5be6a615182fe7cf46be6a3b9683333c4e98f7b7 100644
+index e5e8a4e71c3caf35c50803b7b966cd34adafc647..bbc92b0c8d8d43d442f39640f6929a81be980006 100644
 --- a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-@@ -462,7 +462,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -464,7 +464,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
  
          @Override
          public int[] getSlotsForFace(Direction side) {
@@ -972,7 +972,7 @@ index cb19d28823a701720cd1998310dfc8cc8f50919f..5be6a615182fe7cf46be6a3b9683333c
          }
  
          @Override
-@@ -511,7 +511,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -513,7 +513,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
  
          @Override
          public int[] getSlotsForFace(Direction side) {
@@ -981,7 +981,7 @@ index cb19d28823a701720cd1998310dfc8cc8f50919f..5be6a615182fe7cf46be6a3b9683333c
          }
  
          @Override
-@@ -553,7 +553,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -555,7 +555,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
  
          @Override
          public int[] getSlotsForFace(Direction side) {
@@ -991,7 +991,7 @@ index cb19d28823a701720cd1998310dfc8cc8f50919f..5be6a615182fe7cf46be6a3b9683333c
  
          @Override
 diff --git a/src/main/java/net/minecraft/world/level/chunk/status/ChunkStep.java b/src/main/java/net/minecraft/world/level/chunk/status/ChunkStep.java
-index 4e56398a6fb8b97199f4c74ebebc1055fb718dcf..84faa524b57e1877ed6006be6784b07bc2805ecc 100644
+index f9aad1b8c02b70e620efdc2a58cadf4fff0f3ed5..ccfddd8c47572561238bd27fced90e1c36a53dc3 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/status/ChunkStep.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/status/ChunkStep.java
 @@ -144,7 +144,7 @@ public final class ChunkStep implements ca.spottedleaf.moonrise.patches.chunk_sy
@@ -1004,7 +1004,7 @@ index 4e56398a6fb8b97199f4c74ebebc1055fb718dcf..84faa524b57e1877ed6006be6784b07b
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index 6a465d9b12c92b5385c394fef7456630be97c04d..d0be5fd43b59a8b4dd3ac2fab1c6580936318be0 100644
+index 16f07007a0f73ec0c6f421c9b082518e87e8cc7b..c08c0096eeac2d184256c703f38b230d7ad8ee9f 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 @@ -426,7 +426,7 @@ public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patche
@@ -1148,10 +1148,10 @@ index 8a4f95049c63afb28bef6719c77b7a7092e75aae..f295205e3093f8c3c4ed4c1cf6ac3aaf
              System.out.println("Starting server");
              Thread runThread = new Thread(() -> {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 48ad261eec1b74fad5a4fc1516b75fd2aaecd528..024465e1c1232f839db00432379ca8f42b7ff78b 100644
+index c2df3c38f58d8dcb5e3d62077655af56a3bffd65..20ffe2ac1a7ad4549f46855abdfa0579bcaf82ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -520,7 +520,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -521,7 +521,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void sendTitle(com.destroystokyo.paper.Title title) {
          Preconditions.checkNotNull(title, "Title is null");
          setTitleTimes(title.getFadeIn(), title.getStay(), title.getFadeOut());

patches/server/features/0046-Hashed-rcon-password.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Hashed rcon password
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index 067f91dd019be40cb09f8fa78cae587429488201..765eb86e66125a517f14a568958281bd57c1bc63 100644
+index 3dd5c7441bb300ca17d717af37edbefb89db4b2f..df367fbb8c582614aaf2087aa37d5e47247af810 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
 @@ -73,7 +73,6 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie

patches/server/features/0057-Ticking-Controller.patch

@@ -1,39 +1,23 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 27 Oct 2024 15:07:43 +0900
-Subject: [PATCH] TickControl System
-
-Based on snackbag/TT20
-Copyright (C) 2024 snackbag, Licensed under AGPL v3.0
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <https://www.gnu.org/licenses/>.
+Date: Sat, 14 Dec 2024 00:39:05 +0900
+Subject: [PATCH] Ticking Controller
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5cd9b92bc..6773081b6 100644
+index 8964ccc27ea7db306140fd6b04c9f5cb33158aa0..bd8048bfe2a93c3a4b4bb84e7d992a8bb0c65778 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1668,6 +1668,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1654,6 +1654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void tickServer(BooleanSupplier shouldKeepTicking) {
-+        org.plazmamc.plazma.util.TickControl.tick(); // Plazma - TickControl System
++        org.plazmamc.plazma.util.TickingController.tick(); // Plazma - TickControl System
          org.spigotmc.WatchdogThread.tick(); // Spigot
          long i = Util.getNanos();
          int j = this.pauseWhileEmptySeconds() * 20;
 diff --git a/src/main/java/net/minecraft/server/dedicated/ServerWatchdog.java b/src/main/java/net/minecraft/server/dedicated/ServerWatchdog.java
-index 660a14203..d092bef5e 100644
+index 660a142036c4e608d3d6fed6ec700a3488400bec..d092bef5e6626f000a44a0f424f247a1a69d34af 100644
 --- a/src/main/java/net/minecraft/server/dedicated/ServerWatchdog.java
 +++ b/src/main/java/net/minecraft/server/dedicated/ServerWatchdog.java
 @@ -34,6 +34,7 @@ public class ServerWatchdog implements Runnable {
@@ -45,50 +29,50 @@ index 660a14203..d092bef5e 100644
              long m = Util.getNanos();
              long n = m - l;
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index bb168636c..b55ad2615 100644
+index a84faa2e82a8d33b7bfe71f174f2913b585d99e8..0d8800d05bd6a14b3d5702d6a51f8cb0c7ae2186 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -579,7 +579,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
-         this.lastSpawnState = spawnercreature_d;
-         //profiler.popPush("spawnAndTick"); // Purpur
+@@ -630,7 +630,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
+         // this.lastSpawnState = spawnercreature_d; // Pufferfish - this is managed asynchronously
+         //profiler.popPush("spawnAndTick"); // Plazma - Completely remove Mojang profiler
          boolean flag = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.players().isEmpty(); // CraftBukkit
 -        int k = this.level.getGameRules().getInt(GameRules.RULE_RANDOMTICKING);
-+        int k = org.plazmamc.plazma.util.TickControl.calc(this.level.getGameRules().getInt(GameRules.RULE_RANDOMTICKING), it -> it.accelerate.randomTick, false); // Plazma - TickControl system
++        int k = org.plazmamc.plazma.util.TickingController.calc(this.level.getGameRules().getInt(GameRules.RULE_RANDOMTICKING), it -> it.accelerate.randomTick, false); // Plazma - TickControl system
          List list1;
  
          if (flag && (this.spawnEnemies || this.spawnFriendlies)) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d5662fd0b..48ea65f67 100644
+index 9a54883281352cc4fa08143f5126d61dbd89761d..982b172b188fb890fa7719662e67a007ab172668 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -879,7 +879,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -909,7 +909,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
                      this.setDayTime(this.preciseTime);
                  } else
-                 // Purpur end
+                 // Purpur end - Configurable daylight cycle
 -                this.setDayTime(this.levelData.getDayTime() + 1L);
 +                // Plazma start - TickControl System
-+                if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().tickControl.accelerate.dayTime)
-+                    this.setDayTime(this.levelData.getDayTime() + org.plazmamc.plazma.util.TickControl.missedTicks() + 1L);
-+                else
-+                    this.setDayTime(this.levelData.getDayTime() + 1L);
++                    if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().tickControl.accelerate.dayTime)
++                        this.setDayTime(this.levelData.getDayTime() + org.plazmamc.plazma.util.TickingController.missedTicks() + 1L);
++                    else
++                        this.setDayTime(this.levelData.getDayTime() + 1L);
 +                // Plazma end - TickControl System
              }
  
          }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4653b25a8..9e9dd4ae1 100644
+index d6d43ad1677d035c26619b73e5a2dd6e72ab278b..ee6ad451ba8755cf296e9c0a01404a5ed025e749 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -562,6 +562,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          }
  
          this.tickEffects();
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().tickControl.delay.potionEffect) for (int i = 0; i < org.plazmamc.plazma.util.TickControl.missedTicks(); i++) this.tickEffects(); // Plazma - TickControl System
++        if (plazma.Config.get().tickControl.delay.potionEffect) for (int i = 0; i < org.plazmamc.plazma.util.TickingController.missedTicks(); i++) this.tickEffects(); // Plazma - TickControl System
          this.animStepO = this.animStep;
          this.yBodyRotO = this.yBodyRot;
          this.yHeadRotO = this.yHeadRot;
 diff --git a/src/main/java/net/minecraft/world/entity/PortalProcessor.java b/src/main/java/net/minecraft/world/entity/PortalProcessor.java
-index b4a824996..1e6b32ad6 100644
+index b4a8249964786d484aa0767d0e73d71d2156f0e8..49505d04c737c41e4229d80a7b96d4ed0b68d083 100644
 --- a/src/main/java/net/minecraft/world/entity/PortalProcessor.java
 +++ b/src/main/java/net/minecraft/world/entity/PortalProcessor.java
 @@ -24,7 +24,7 @@ public class PortalProcessor {
@@ -100,51 +84,51 @@ index b4a824996..1e6b32ad6 100644
          }
      }
  
-@@ -41,6 +41,14 @@ public class PortalProcessor {
-         this.portalTime = Math.max(this.portalTime - 4, 0);
+@@ -33,6 +33,14 @@ public class PortalProcessor {
+         return this.portal.getPortalDestination(world, entity, this.entryPosition);
      }
  
 +    // Plazma start - TickControl System
 +    private int increaseTick() {
-+        if (!org.plazmamc.plazma.configurations.GlobalConfiguration.get().tickControl.delay.portalUse)
-+            this.portalTime += org.plazmamc.plazma.util.TickControl.missedTicks();
++        if (!plazma.Config.get().tickControl.delay.portalUse)
++            this.portalTime += org.plazmamc.plazma.util.TickingController.missedTicks();
 +        return this.portalTime++;
 +    }
 +    // Plazma end - TickControl System
 +
-     public boolean hasExpired() {
-         return this.portalTime <= 0;
+     public Portal.Transition getPortalLocalTransition() {
+         return this.portal.getLocalTransition();
      }
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 89d89a1b0..7c4228c0b 100644
+index 4aaaadce69e62fa371d5b441e5e69c1384e5d63e..97c63c335287e01b20687eeea4a5815520363e13 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -158,6 +158,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
          if (this.getItem().isEmpty()) {
              this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
          } else {
-+            if (this.pickupDelay > 0 && org.plazmamc.plazma.configurations.GlobalConfiguration.get().tickControl.delay.itemPickup) this.pickupDelay = Math.max(this.pickupDelay - org.plazmamc.plazma.util.TickControl.missedTicks(), 0); // Plazma - TickControl System
++            if (this.pickupDelay > 0 && plazma.Config.get().tickControl.delay.itemPickup) this.pickupDelay = Math.max(this.pickupDelay - org.plazmamc.plazma.util.TickingController.missedTicks(), 0); // Plazma - TickControl System
              super.tick();
              // Paper start - remove anti tick skipping measures / wall time - revert to vanilla
              if (this.pickupDelay > 0 && this.pickupDelay != 32767) {
 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 c1d068fa9..27361bde0 100644
+index 5a9e85c44fbb716dc1e8616645732cb8db947ee9..4ea1a327c80f915aa45ccf3a5955ed6ff42692c1 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -302,6 +302,11 @@ public abstract class Player extends LivingEntity {
+@@ -305,6 +305,11 @@ public abstract class Player extends LivingEntity {
              if (this.sleepCounter > 100) {
                  this.sleepCounter = 100;
              }
 +            // Plazma start - TickControl System
-+            else if (this.sleepCounter < 100 && org.plazmamc.plazma.configurations.GlobalConfiguration.get().tickControl.delay.sleep && org.plazmamc.plazma.util.TickControl.missedTicks() > 0) {
-+                this.sleepCounter += org.plazmamc.plazma.util.TickControl.missedTicks();
++            else if (this.sleepCounter < 100 && plazma.Config.get().tickControl.delay.sleep && org.plazmamc.plazma.util.TickingController.missedTicks() > 0) {
++                this.sleepCounter += org.plazmamc.plazma.util.TickingController.missedTicks();
 +            }
 +            // Plazma end - TickControl System
  
-             if (!this.level().isClientSide && this.level().isDay()) {
+             if (/*!this.level().isClientSide &&*/ this.level().isDay()) { // Plazma - Remove persist 'isClientSide' flag
                  this.stopSleepInBed(false, true);
 diff --git a/src/main/java/net/minecraft/world/item/Item.java b/src/main/java/net/minecraft/world/item/Item.java
-index 3d948c8d3..0c77997e0 100644
+index 29afbe0aa72f12d8fa6c03af55d17abef89c8dd4..78742ef91ed332d229d007af9224555a79cd6be9 100644
 --- a/src/main/java/net/minecraft/world/item/Item.java
 +++ b/src/main/java/net/minecraft/world/item/Item.java
 @@ -260,7 +260,7 @@ public class Item implements FeatureElement, ItemLike {
@@ -152,12 +136,12 @@ index 3d948c8d3..0c77997e0 100644
      public int getUseDuration(ItemStack stack, LivingEntity user) {
          Consumable consumable = stack.get(DataComponents.CONSUMABLE);
 -        return consumable != null ? consumable.consumeTicks() : 0;
-+        return consumable != null ? org.plazmamc.plazma.util.TickControl.calc(consumable.eatDurationTicks(), it -> it.delay.itemUse, true) : 0; // Plazma - TickControl System
++        return consumable != null ? org.plazmamc.plazma.util.TickingController.calc(consumable.consumeTicks(), it -> it.delay.itemUse, true) : 0; // Plazma - TickControl System
      }
  
      public boolean releaseUsing(ItemStack stack, Level world, LivingEntity user, int remainingUseTicks) {
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 852bfe68a..3cb943ea4 100644
+index c8ae6e4cd74549f753ec04def5d882de1ab72308..b01b80ff0318f95a737ce3f93a5c69426019cc9c 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 @@ -336,13 +336,14 @@ public abstract class BlockBehaviour implements FeatureElement {
@@ -173,7 +157,7 @@ index 852bfe68a..3cb943ea4 100644
 -        }
 +        // Plazma start - TickControl system
 +        if (f == -1.0F) return 0.0F;
-+        return org.plazmamc.plazma.util.TickControl.calc(
++        return org.plazmamc.plazma.util.TickingController.calc(
 +            player.getDestroySpeed(state) / f / (player.hasCorrectToolForDrops(state) ? 30 : 100),
 +            it -> it.delay.blockBreak,
 +            false
@@ -183,69 +167,69 @@ index 852bfe68a..3cb943ea4 100644
  
      protected void spawnAfterBreak(BlockState state, ServerLevel world, BlockPos pos, ItemStack tool, boolean dropExperience) {}
 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 9cc1a79dd25c63af6986e721ceff5560cf56b7d1..c45224e142905921305da51139d5fd3f51583cca 100644
+index a1756429e8fc09cfd78109c4d5113857304b317d..158da3ebd4b09d8c682960ff658a2e861cbee6dc 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -1036,8 +1036,18 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
-             this.chunkCoordinateKey = chunkCoordinateKey; // Plazma - Port SparklyPaper patches; Optimize TickingBlockEntity
+@@ -1081,8 +1081,18 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+             this.chunkCoordinateKey = chunkCoordinateKey;
          }
  
 +        // Plazma start - TickControl System
-+        private void tickTicker(BlockState iblockdata) {
-+            this.ticker.tick(LevelChunk.this.level, this.blockEntity.getBlockPos(), iblockdata, this.blockEntity);
++        private void tickTicker(BlockState state) {
++            this.ticker.tick(LevelChunk.this.level, this.blockEntity.getBlockPos(), state, this.blockEntity);
 +
-+            if (!org.plazmamc.plazma.util.TickControl.shouldTickAgain(iblockdata.getBlock())) return;
-+            for (int i = 0; i < org.plazmamc.plazma.util.TickControl.missedTicks(); i++)
-+                this.ticker.tick(LevelChunk.this.level, this.blockEntity.getBlockPos(), iblockdata, this.blockEntity);
++            if (!org.plazmamc.plazma.util.TickingController.shouldTickAgain(state.getBlock())) return;
++            for (int i = 0; i < org.plazmamc.plazma.util.TickingController.missedTicks(); i++)
++                this.ticker.tick(LevelChunk.this.level, this.blockEntity.getBlockPos(), state, this.blockEntity);
 +        }
 +        // Plazma end - TickControl System
 +
          @Override
 -        public void tick() {
 +        public final void tick() { // Plazma - TickControl System (make final)
-             if (!this.blockEntity.isRemoved() && this.blockEntity.hasLevel()) {
-                 BlockPos blockposition = this.blockEntity.getBlockPos();
+             if (this.blockEntity.isRemoved() || !this.blockEntity.hasLevel()) return;
  
-@@ -1050,7 +1060,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
-                         BlockState iblockdata = LevelChunk.this.getBlockState(blockposition);
+             BlockPos pos = this.blockEntity.getBlockPos();
+@@ -1092,7 +1102,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+                 BlockState state = LevelChunk.this.getBlockState(pos);
  
-                         if (this.blockEntity.getType().isValid(iblockdata)) {
--                            this.ticker.tick(LevelChunk.this.level, this.blockEntity.getBlockPos(), iblockdata, this.blockEntity);
-+                            this.tickTicker(iblockdata); // Plazma - TickControl System
-                             this.loggedInvalidBlockState = false;
-                         // Paper start - Remove the Block Entity if it's invalid
-                         } else {
+                 if (this.blockEntity.getType().isValid(state)) {
+-                    this.ticker.tick(LevelChunk.this.level, this.blockEntity.getBlockPos(), state, this.blockEntity);
++                    this.tickTicker(state); // Plazma - TickControl System
+                     this.loggedInvalidBlockState = false;
+                     // Paper start - Remove the Block Entity if it's invalid
+                 } else {
 diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
-index 2d492d849ff73a738dfbcb16507feb89bf19a962..67206b9c754dfe90002e0bcf6995eae60b852acd 100644
+index 6e643c1a7f7e71cfd20603facaf224985ee81716..cbbbcf8a915a4146eb63e29ba5dd91354ac7228b 100644
 --- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java
 +++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
-@@ -180,7 +180,7 @@ public abstract class LavaFluid extends FlowingFluid {
+@@ -181,7 +181,7 @@ public abstract class LavaFluid extends FlowingFluid {
  
      @Override
      public int getTickDelay(LevelReader world) {
 -        return world.dimensionType().ultraWarm() ? world.getWorldBorder().world.purpurConfig.lavaSpeedNether : world.getWorldBorder().world.purpurConfig.lavaSpeedNotNether; // Purpur
-+        return org.plazmamc.plazma.util.TickControl.calc(world.dimensionType().ultraWarm() ? world.getWorldBorder().world.purpurConfig.lavaSpeedNether : world.getWorldBorder().world.purpurConfig.lavaSpeedNotNether, it -> it.delay.lavaFluid, true); // Purpur // Plazma - TickControl system
++        return org.plazmamc.plazma.util.TickingController.calc(world.dimensionType().ultraWarm() ? world.getWorldBorder().world.purpurConfig.lavaSpeedNether : world.getWorldBorder().world.purpurConfig.lavaSpeedNotNether, it -> it.delay.lavaFluid, true); // Purpur // Plazma - TickControl system
      }
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/material/WaterFluid.java b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
-index 0fc89b33864000a262ec5369708f7aedeaf6dc0b..5055730053d9d9c1da0a5252654c936c75d04fb6 100644
+index 028aea6640356ba80f5d682e3cc03b7f82f5b9c7..d788849dc5a568d455cd83ca5b6e1b4ba1a9161f 100644
 --- a/src/main/java/net/minecraft/world/level/material/WaterFluid.java
 +++ b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
-@@ -122,7 +122,7 @@ public abstract class WaterFluid extends FlowingFluid {
+@@ -123,7 +123,7 @@ public abstract class WaterFluid extends FlowingFluid {
  
      @Override
      public int getTickDelay(LevelReader world) {
 -        return world.getWorldBorder().world.plazmaConfig().block.waterFlowingTick; // Plazma - Configurable water flowing speed
-+        return org.plazmamc.plazma.util.TickControl.calc(world.getWorldBorder().world.plazmaConfig().block.waterFlowingTick, it -> it.delay.waterFluid, true); // Plazma - Configurable water flowing speed; TickControl System
++        return org.plazmamc.plazma.util.TickingController.calc(world.getWorldBorder().world.plazmaConfig().block.waterFlowingTick, it -> it.delay.waterFluid, true); // Plazma - Configurable water flowing speed // Plazma - TickControl System
      }
  
      @Override
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 49bce6e28e12f3729cab5628cf3e0f508a56d0d7..2a88a25793e6d963a9a08e615a72c6ed1677a18b 100644
+index 768cb135081c233a820566015ed58351e417c45c..898f9e6ec6f306a15639ee0d03bcfe7bf55e2c6c 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -146,4 +146,39 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -195,4 +195,39 @@ public class GlobalConfiguration extends ConfigurationPart {
  
      }
  
@@ -279,18 +263,18 @@ index 49bce6e28e12f3729cab5628cf3e0f508a56d0d7..2a88a25793e6d963a9a08e615a72c6ed
 +
 +        @PostProcess
 +        void post() {
-+            org.plazmamc.plazma.util.TickControl.post(this);
++            org.plazmamc.plazma.util.TickingController.post(this);
 +        }
 +
 +    }
 +
  }
-diff --git a/src/main/java/org/plazmamc/plazma/util/TickControl.java b/src/main/java/org/plazmamc/plazma/util/TickControl.java
+diff --git a/src/main/java/org/plazmamc/plazma/util/TickingController.java b/src/main/java/org/plazmamc/plazma/util/TickingController.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..c8db7b9f590a34b38448a970baaa79dd73eab8d8
+index 0000000000000000000000000000000000000000..0e71a47a639a1a3dd0918c5a403ed827aca67966
 --- /dev/null
-+++ b/src/main/java/org/plazmamc/plazma/util/TickControl.java
-@@ -0,0 +1,57 @@
++++ b/src/main/java/org/plazmamc/plazma/util/TickingController.java
+@@ -0,0 +1,56 @@
 +package org.plazmamc.plazma.util;
 +
 +import net.minecraft.world.level.block.Block;
@@ -301,14 +285,13 @@ index 0000000000000000000000000000000000000000..c8db7b9f590a34b38448a970baaa79dd
 +
 +import static net.minecraft.server.MinecraftServer.getServer;
 +
-+public final class TickControl {
++public final class TickingController {
 +
-+
-+    private static @Nullable TickControl INSTANCE;
++    private static @Nullable TickingController INSTANCE;
 +    private final GlobalConfiguration.TickControl configuration;
 +    private int missedTicks = 0;
 +
-+    private TickControl(GlobalConfiguration.TickControl configuration) {
++    private TickingController(GlobalConfiguration.TickControl configuration) {
 +        this.configuration = configuration;
 +    }
 +
@@ -324,7 +307,7 @@ index 0000000000000000000000000000000000000000..c8db7b9f590a34b38448a970baaa79dd
 +            return;
 +        }
 +
-+        INSTANCE = new TickControl(configuration);
++        INSTANCE = new TickingController(configuration);
 +    }
 +
 +    public static float calc(float original, @NonNull Function<GlobalConfiguration.TickControl, Boolean> isAffected, boolean swap) {

patches/server/features/0064-Bundle-as-quivers.patch

@@ -0,0 +1,225 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Wed, 22 Jan 2025 11:50:19 +0900
+Subject: [PATCH] Bundle as quivers
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+index ee6ad451ba8755cf296e9c0a01404a5ed025e749..53c62f51bcdaecba265eb2e0f5e69e890b1b0b03 100644
+--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+@@ -4774,7 +4774,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
+         return !this.isSleeping() && super.isInWall();
+     }
+ 
+-    public ItemStack getProjectile(ItemStack stack) {
++    // Plazma start - Bundle as quivers!
++    public final ItemStack getProjectile(final ItemStack stack) {
++        return this.getProjectile(stack, false, false);
++    }
++
++    public ItemStack getProjectile(final ItemStack stack, final boolean bundle, final boolean shrink) {
++    // Plazma end - Bundle as quivers!
+         return ItemStack.EMPTY;
+     }
+ 
+diff --git a/src/main/java/net/minecraft/world/entity/monster/Monster.java b/src/main/java/net/minecraft/world/entity/monster/Monster.java
+index c2061f575c731ecc6071384b007517c08e0cf983..a9f7a1ef69fa6fb8ce45237dd812a4827eb5940d 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/Monster.java
++++ b/src/main/java/net/minecraft/world/entity/monster/Monster.java
+@@ -143,7 +143,7 @@ public abstract class Monster extends PathfinderMob implements Enemy {
+     }
+ 
+     @Override
+-    public ItemStack getProjectile(ItemStack stack) {
++    public final ItemStack getProjectile(final ItemStack stack, final boolean bundle, final boolean shrink) { // Plazma - Bundle as quivers!
+         if (stack.getItem() instanceof ProjectileWeaponItem) {
+             Predicate<ItemStack> predicate = ((ProjectileWeaponItem)stack.getItem()).getSupportedHeldProjectiles();
+             ItemStack itemStack = ProjectileWeaponItem.getHeldProjectile(this, predicate);
+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 4ea1a327c80f915aa45ccf3a5955ed6ff42692c1..121c2a78b0ae30785dcb3587cfd228d049e10993 100644
+--- a/src/main/java/net/minecraft/world/entity/player/Player.java
++++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+@@ -2321,30 +2321,49 @@ public abstract class Player extends LivingEntity {
+     // Paper end - PlayerReadyArrowEvent
+ 
+     @Override
+-    public ItemStack getProjectile(ItemStack stack) {
+-        if (!(stack.getItem() instanceof ProjectileWeaponItem)) {
+-            return ItemStack.EMPTY;
+-        } else {
+-            Predicate<ItemStack> predicate = ((ProjectileWeaponItem) stack.getItem()).getSupportedHeldProjectiles().and(item -> tryReadyArrow(stack, item)); // Paper - PlayerReadyArrowEvent
+-            ItemStack itemstack1 = ProjectileWeaponItem.getHeldProjectile(this, predicate);
++    // Plazma start - Bundle as quivers!
++    public final ItemStack getProjectile(final ItemStack stack, final boolean bundle, final boolean shrink) {
++        if (!(stack.getItem() instanceof ProjectileWeaponItem weapon)) return ItemStack.EMPTY;
+ 
+-            if (!itemstack1.isEmpty()) {
+-                return itemstack1;
+-            } else {
+-                predicate = ((ProjectileWeaponItem) stack.getItem()).getAllSupportedProjectiles().and(item -> tryReadyArrow(stack, item)); // Paper - PlayerReadyArrowEvent
++        Predicate<ItemStack> predicate = weapon.getSupportedHeldProjectiles().and(item -> tryReadyArrow(stack, item)); // Paper - PlayerReadyArrowEvent
++        final ItemStack held = ProjectileWeaponItem.getHeldProjectile(this, predicate);
++        if (!held.isEmpty()) return held;
++
++        predicate = weapon.getAllSupportedProjectiles().and(item -> tryReadyArrow(stack, item)); // Paper - PlayerReadyArrowEvent
++        for (int i = 0; i < this.inventory.getContainerSize(); ++i) {
++            ItemStack item = this.inventory.getItem(i);
+ 
+-                for (int i = 0; i < this.inventory.getContainerSize(); ++i) {
+-                    ItemStack itemstack2 = this.inventory.getItem(i);
++            if (bundle && item.getItem() instanceof net.minecraft.world.item.BundleItem) {
++                final net.minecraft.world.item.component.BundleContents contents = item.get(net.minecraft.core.component.DataComponents.BUNDLE_CONTENTS);
++                if (contents == null || contents.isEmpty()) continue;
+ 
+-                    if (predicate.test(itemstack2)) {
+-                        return itemstack2;
+-                    }
++                final Optional<ItemStack> optional = contents.itemCopyStream().filter(predicate).findFirst();
++                if (optional.isEmpty()) continue;
++
++                final ItemStack first = optional.get();
++                if (shrink) {
++                    final net.minecraft.world.item.component.BundleContents.Mutable mutable = new net.minecraft.world.item.component.BundleContents.Mutable(contents);
++                    final ItemStack next = mutable.removeOne(first.copyAndClear());
++                    if (next == null) continue;
++
++                    next.shrink(1);
++                    if (next.getCount() != 0) mutable.tryInsert(next);
++
++                    item.set(net.minecraft.core.component.DataComponents.BUNDLE_CONTENTS, mutable.toImmutable());
+                 }
+ 
+-                return this.abilities.instabuild ? new ItemStack(Items.ARROW) : ItemStack.EMPTY;
++                first.setCount(1);
++                return first;
++            }
++
++            if (predicate.test(item)) {
++                return item;
+             }
+         }
++
++        return this.abilities.instabuild ? new ItemStack(Items.ARROW) : ItemStack.EMPTY;
+     }
++    // Plazma end - Bundle as quivers!
+ 
+     @Override
+     public Vec3 getRopeHoldPosition(float delta) {
+diff --git a/src/main/java/net/minecraft/world/item/BowItem.java b/src/main/java/net/minecraft/world/item/BowItem.java
+index 58fa528e4b2589d362eb976afd6221cd94f2623c..6a2381e37709b05a9c5e49c34d549a6da1b8f388 100644
+--- a/src/main/java/net/minecraft/world/item/BowItem.java
++++ b/src/main/java/net/minecraft/world/item/BowItem.java
+@@ -27,7 +27,7 @@ public class BowItem extends ProjectileWeaponItem {
+         if (!(user instanceof Player player)) {
+             return false;
+         } else {
+-            ItemStack itemStack = player.getProjectile(stack);
++            ItemStack itemStack = player.getProjectile(stack, world.plazmaConfig().item.bundleAsQuivers.enableForBow, net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.INFINITY, stack) == 0); // Plazma - Bundle as quivers!
+             //  Purpur start
+             if (world.purpurConfig.infinityWorksWithoutArrows && itemStack.isEmpty() && net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.INFINITY, stack) > 0) {
+                 itemStack = new ItemStack(Items.ARROW);
+@@ -93,7 +93,7 @@ public class BowItem extends ProjectileWeaponItem {
+     @Override
+     public InteractionResult use(Level world, Player user, InteractionHand hand) {
+         ItemStack itemStack = user.getItemInHand(hand);
+-        boolean bl = !user.getProjectile(itemStack).isEmpty();
++        boolean bl = !user.getProjectile(itemStack, world.plazmaConfig().item.bundleAsQuivers.enableForBow, false).isEmpty();
+         if (!user.hasInfiniteMaterials() && !bl && !(world.purpurConfig.infinityWorksWithoutArrows && net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.INFINITY, itemStack) > 0)) { // Purpur
+             return InteractionResult.FAIL;
+         } else {
+diff --git a/src/main/java/net/minecraft/world/item/CrossbowItem.java b/src/main/java/net/minecraft/world/item/CrossbowItem.java
+index f8946704838d96ad522182d2b9f41ac8bfe92ac4..c46b5e6fb007280b1ff264414c9acaf8a5f49101 100644
+--- a/src/main/java/net/minecraft/world/item/CrossbowItem.java
++++ b/src/main/java/net/minecraft/world/item/CrossbowItem.java
+@@ -72,7 +72,7 @@ public class CrossbowItem extends ProjectileWeaponItem {
+         if (chargedProjectiles != null && !chargedProjectiles.isEmpty()) {
+             this.performShooting(world, user, hand, itemStack, getShootingPower(chargedProjectiles), (float) world.purpurConfig.crossbowProjectileOffset, null); // Purpur
+             return InteractionResult.CONSUME;
+-        } else if (!user.getProjectile(itemStack).isEmpty()) {
++        } else if (!user.getProjectile(itemStack, world.plazmaConfig().item.bundleAsQuivers.enableForCrossbow, false).isEmpty() || net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.INFINITY, itemStack) > 0 && world.plazmaConfig().item.allowCrossbowInfinity) { // Plazma - Bundle as quivers!
+             this.startSoundPlayed = false;
+             this.midLoadSoundPlayed = false;
+             user.startUsingItem(hand);
+@@ -124,7 +124,11 @@ public class CrossbowItem extends ProjectileWeaponItem {
+         return CrossbowItem.tryLoadProjectiles(shooter, crossbow, true);
+     }
+     private static boolean tryLoadProjectiles(LivingEntity shooter, ItemStack crossbow, boolean consume) {
+-        List<ItemStack> list = draw(crossbow, shooter.getProjectile(crossbow), shooter, consume);
++        // Plazma start - Bundle as quivers!
++        boolean infinity = net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.INFINITY, crossbow) > 0 && shooter.level().plazmaConfig().item.allowCrossbowInfinity;
++        List<ItemStack> list = draw(crossbow, shooter.getProjectile(crossbow, shooter.level().plazmaConfig().item.bundleAsQuivers.enableForBow, !infinity), shooter, consume);
++        if (list.isEmpty() && infinity) list = List.of(new ItemStack(Items.ARROW));
++        // Plazma end - Bundle as quivers!
+         // Paper end - Add EntityLoadCrossbowEvent
+         if (!list.isEmpty()) {
+             crossbow.set(DataComponents.CHARGED_PROJECTILES, ChargedProjectiles.of(list));
+diff --git a/src/main/java/net/minecraft/world/item/component/BundleContents.java b/src/main/java/net/minecraft/world/item/component/BundleContents.java
+index d4e7e92875162b67226a20c5add8973e09fd882c..6e57ed3b395b0155bdf13129c11ee8ddf4a68199 100644
+--- a/src/main/java/net/minecraft/world/item/component/BundleContents.java
++++ b/src/main/java/net/minecraft/world/item/component/BundleContents.java
+@@ -157,7 +157,13 @@ public final class BundleContents implements TooltipComponent {
+         }
+ 
+         private int findStackIndex(ItemStack stack) {
+-            if (!stack.isStackable()) {
++            // Plazma start - Bundle as quivers!
++            return this.findStackIndex(stack, false);
++        }
++
++        private int findStackIndex(final ItemStack stack, final boolean skipStackableCheck) {
++            if (!skipStackableCheck && !stack.isStackable()) {
++            // Plazma end - Bundle as quivers!
+                 return -1;
+             } else {
+                 for (int i = 0; i < this.items.size(); i++) {
+@@ -211,11 +217,20 @@ public final class BundleContents implements TooltipComponent {
+ 
+         @Nullable
+         public ItemStack removeOne() {
++            // Plazma start - Bundle as quivers!
++            return this.removeOne(null);
++        }
++
++        @Nullable
++        public ItemStack removeOne(final @Nullable ItemStack stack) {
++            // Plazma end - Bundle as quivers!
+             if (this.items.isEmpty()) {
+                 return null;
+             } else {
+-                int i = this.selectedItem != -1 && this.selectedItem < this.items.size() ? this.selectedItem : 0;
+-                ItemStack itemStack = this.items.remove(i).copy();
++                // Plazma start - Bundle as quivers!
++                int i = stack != null ? this.findStackIndex(stack, true) : this.selectedItem != -1 && this.selectedItem < this.items.size() ? this.selectedItem : 0;
++                ItemStack itemStack = this.items.remove(i != -1 ? i : 0).copy();
++                // Plazma end - Bundle as quivers!
+                 this.weight = this.weight.subtract(BundleContents.getWeight(itemStack).multiplyBy(Fraction.getFraction(itemStack.getCount(), 1)));
+                 this.toggleSelectedItem(-1);
+                 return itemStack;
+diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
+index e88b18ff76bf21d9fa340a1d58abedefbf30ec91..8daf361f82af8d41661d8c5afe717c8a90803dfe 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
+@@ -104,6 +104,7 @@ public class WorldConfigurations extends ConfigurationPart {
+     public class Item extends ConfigurationPart {
+ 
+         public boolean skipMapUpdateIfCraftRenderIsNull = true;
++        public boolean allowCrossbowInfinity = false;
+ 
+         public ShootableFireCharge shootableFireCharge;
+         public class ShootableFireCharge extends ConfigurationPart {
+@@ -125,6 +126,14 @@ public class WorldConfigurations extends ConfigurationPart {
+ 
+         }
+ 
++        public BundleAsQuivers bundleAsQuivers;
++        public class BundleAsQuivers extends ConfigurationPart {
++
++            public boolean enableForBow = false;
++            public boolean enableForCrossbow = false;
++
++        }
++
+     }
+ 
+ }

patches/server/features/outdated/0057-Implement-CarpetFixes.patch

@@ -0,0 +1,227 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Sat, 14 Dec 2024 00:29:15 +0900
+Subject: [PATCH] Implement CarpetFixes
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
+index 0503f936d0d7194f110069adabff984f51af0a3a..0ca88636cca9b8f93cddf8bc58038e626e171df8 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
++++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
+@@ -379,19 +379,22 @@ public class Sheep extends Animal implements Shearable {
+     }
+ 
+     private DyeColor getOffspringColor(ServerLevel world, Sheep firstParent, Sheep secondParent) {
+-        DyeColor enumcolor = firstParent.getColor();
+-        DyeColor enumcolor1 = secondParent.getColor();
+-        CraftingInput craftinginput = Sheep.makeCraftInput(enumcolor, enumcolor1);
+-        Optional<Item> optional = world.recipeAccess().getRecipeFor(RecipeType.CRAFTING, craftinginput, world).map((recipeholder) -> { // CraftBukkit - decompile error
+-            return ((CraftingRecipe) recipeholder.value()).assemble(craftinginput, world.registryAccess());
+-        }).map(ItemStack::getItem);
+-
+-        Objects.requireNonNull(DyeItem.class);
+-        optional = optional.filter(DyeItem.class::isInstance);
+-        Objects.requireNonNull(DyeItem.class);
+-        return (DyeColor) optional.map(DyeItem.class::cast).map(DyeItem::getDyeColor).orElseGet(() -> {
+-            return world.random.nextBoolean() ? enumcolor : enumcolor1;
+-        });
++        // Plazma start - Implement CarpetFixes
++        final DyeColor firstColor = firstParent.getColor();
++        final DyeColor secondColor = secondParent.getColor();
++// PLAZMA - REMOVE THIS
++        if (world.plazmaConfig().carpetFixes.preparedSheepChildColor) {
++            final DyeColor color = org.plazmamc.plazma.util.CarpetFixes.properDyeMixin(firstColor, secondColor);
++            if (color != null) return color;
++            return world.random.nextBoolean() ? firstColor : secondColor;
++        }
++// PLAZMA - REMOVE THIS
++        final CraftingInput input = Sheep.makeCraftInput(firstColor, secondColor);
++// PLAZMA - REMOVE THIS
++        Optional<Item> result = world.recipeAccess().getRecipeFor(RecipeType.CRAFTING, input, world).map((recipeholder) -> recipeholder.value().assemble(input, world.registryAccess())).map(ItemStack::getItem);
++        result = result.filter(DyeItem.class::isInstance);
++        return result.map(DyeItem.class::cast).map(DyeItem::getDyeColor).orElseGet(() -> world.random.nextBoolean() ? firstColor : secondColor);
++        // Plazma end - Implement CarpetFixes
+     }
+ 
+     private static CraftingInput makeCraftInput(DyeColor firstColor, DyeColor secondColor) {
+diff --git a/src/main/java/net/minecraft/world/level/biome/BiomeManager.java b/src/main/java/net/minecraft/world/level/biome/BiomeManager.java
+index 90f8360f547ce709fd13ee34f8e67d8bfa94b498..4e5fb377696c0a98a56f9ea11d0116b28399c8f6 100644
+--- a/src/main/java/net/minecraft/world/level/biome/BiomeManager.java
++++ b/src/main/java/net/minecraft/world/level/biome/BiomeManager.java
+@@ -9,6 +9,8 @@ import net.minecraft.util.Mth;
+ 
+ public class BiomeManager {
+     public static final int CHUNK_CENTER_QUART = QuartPos.fromBlock(8);
++    public static boolean PLAZMA_CARPET_FIXES = false; // Plazma - Implement CarpetFixes
++    private static final double MAX_OFFSET = 0.450_000_000_1; // Plazma - Implement CarpetFixes
+     private static final int ZOOM_BITS = 2;
+     private static final int ZOOM = 4;
+     private static final int ZOOM_MASK = 3;
+@@ -29,6 +31,79 @@ public class BiomeManager {
+     }
+ 
+     public Holder<Biome> getBiome(BlockPos pos) {
++        // Plazma start - Implement CarpetFixes
++        if (PLAZMA_CARPET_FIXES) {
++            final int x2 = pos.getX() - 2;
++            final int y2 = pos.getY() - 2;
++            final int z2 = pos.getZ() - 2;
++
++            final int x = x2 >> 2;
++            final int y = y2 >> 2;
++            final int z = z2 >> 2;
++
++            final double qX = (x2 & 3) / 4.0D;
++            final double qY = (y2 & 3) / 4.0D;
++            final double qZ = (z2 & 3) / 4.0D;
++
++            int minX = 0;
++            double minD = Double.POSITIVE_INFINITY;
++            for (int bX = 0; bX < 8; ++bX) {
++                final boolean x0 = (bX & 4) == 0;
++                final boolean y0 = (bX & 2) == 0;
++                final boolean z0 = (bX & 1) == 0;
++
++                final double x1 = x0 ? qX : qX - 1.0D;
++                final double y1 = y0 ? qY : qY - 1.0D;
++                final double z1 = z0 ? qZ : qZ - 1.0D;
++
++                double maxQY = 0.0D;
++                double maxQZ = 0.0D;
++                if (bX != 0) {
++                    final double maxQX = Mth.square(Math.max(x1 + MAX_OFFSET, Math.abs(x1 - MAX_OFFSET)));
++                    maxQY = Mth.square(Math.max(y1 + MAX_OFFSET, Math.abs(y1 - MAX_OFFSET)));
++                    maxQZ = Mth.square(Math.max(z1 + MAX_OFFSET, Math.abs(z1 - MAX_OFFSET)));
++
++                    if (minD < maxQY + maxQZ + maxQX) continue;
++                }
++
++                int pX = x0 ? x : x + 1;
++                int pY = y0 ? y : y + 1;
++                int pZ = z0 ? z : z + 1;
++
++                long seed = this.biomeZoomSeed;
++                seed = LinearCongruentialGenerator.next(seed, pX);
++                seed = LinearCongruentialGenerator.next(seed, pY);
++                seed = LinearCongruentialGenerator.next(seed, pZ);
++                seed = LinearCongruentialGenerator.next(seed, pX);
++                seed = LinearCongruentialGenerator.next(seed, pY);
++                seed = LinearCongruentialGenerator.next(seed, pZ);
++
++                double dX = getFiddle(seed);
++                double sX = Mth.square(x1 + dX);
++                if (bX != 0 && minD < sX + maxQY + maxQZ) continue;
++
++                seed = LinearCongruentialGenerator.next(seed, this.biomeZoomSeed);
++                double dY = getFiddle(seed);
++                double sY = Mth.square(y1 + dY);
++                if (bX != 0 && minD < sX + sY + maxQZ) continue;
++
++                seed = LinearCongruentialGenerator.next(seed, this.biomeZoomSeed);
++                double dZ = getFiddle(seed);
++                double bD = sX + sY + Mth.square(z1 + dZ);
++
++                if (minD <= bD) continue;
++                minX = bX;
++                minD = bD;
++            }
++
++            return this.noiseBiomeSource.getNoiseBiome(
++                (minX & 4) == 0 ? x : x + 1,
++                (minX & 2) == 0 ? y : y + 1,
++                (minX & 1) == 0 ? z : z + 1
++            );
++        }
++        // Plazma end - Implement CarpetFixes
++
+         int i = pos.getX() - 2;
+         int j = pos.getY() - 2;
+         int k = pos.getZ() - 2;
+diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+index 538c572661bd92666f84e6f9ef3e9760f69f50a9..db31d0c066e92fe308e7e64075e832bec66a5c02 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+@@ -188,4 +188,16 @@ public class GlobalConfiguration extends ConfigurationPart {
+ 
+     }
+ 
++    public CarpetFixes carpetFixes;
++    public class CarpetFixes extends ConfigurationPart {
++
++        boolean optimizeBiomeAccess = OPTIMIZE;
++
++        @PostProcess
++        void post() {
++            net.minecraft.world.level.biome.BiomeManager.PLAZMA_CARPET_FIXES = this.optimizeBiomeAccess;
++        }
++
++    }
++
+ }
+diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
+index 36345efa302413ad4e7d6e611d182572622f76ff..d314be46a02d73e669088d3a37937c8751f7735d 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
+@@ -126,4 +126,11 @@ public class WorldConfigurations extends ConfigurationPart {
+ 
+     }
+ 
++    public CarpetFixes carpetFixes;
++    public class CarpetFixes extends ConfigurationPart {
++
++        public boolean preparedSheepChildColor = OPTIMIZE;
++
++    }
++
+ }
+diff --git a/src/main/java/org/plazmamc/plazma/util/CarpetFixes.java b/src/main/java/org/plazmamc/plazma/util/CarpetFixes.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..a5b0ce75a0ffa65e357cde2d55b7a0f116a2afad
+--- /dev/null
++++ b/src/main/java/org/plazmamc/plazma/util/CarpetFixes.java
+@@ -0,0 +1,45 @@
++package org.plazmamc.plazma.util;
++
++import net.minecraft.world.item.DyeColor;
++
++public interface CarpetFixes {
++
++    static DyeColor properDyeMixin(DyeColor firstColor, DyeColor secondColor) {
++        if (firstColor.equals(secondColor)) return firstColor;
++
++        return switch (firstColor) {
++            case WHITE -> switch (secondColor) {
++                case BLUE -> DyeColor.LIGHT_BLUE;
++                case GRAY -> DyeColor.LIGHT_GRAY;
++                case BLACK -> DyeColor.GRAY;
++                case GREEN -> DyeColor.LIME;
++                case RED -> DyeColor.PINK;
++                default -> null;
++            };
++            case BLUE -> switch (secondColor) {
++                case WHITE -> DyeColor.LIGHT_BLUE;
++                case GREEN -> DyeColor.CYAN;
++                case RED -> DyeColor.PURPLE;
++                default -> null;
++            };
++            case RED -> switch (secondColor) {
++                case YELLOW -> DyeColor.ORANGE;
++                case WHITE -> DyeColor.PINK;
++                case BLUE -> DyeColor.PURPLE;
++                default -> null;
++            };
++            case GREEN -> switch (secondColor) {
++                case BLUE -> DyeColor.CYAN;
++                case WHITE -> DyeColor.LIME;
++                default -> null;
++            };
++            case YELLOW -> secondColor.equals(DyeColor.RED) ? DyeColor.ORANGE : null;
++            case PURPLE -> secondColor.equals(DyeColor.PINK) ? DyeColor.MAGENTA : null;
++            case PINK -> secondColor.equals(DyeColor.PURPLE) ? DyeColor.MAGENTA : null;
++            case GRAY -> secondColor.equals(DyeColor.WHITE) ? DyeColor.LIGHT_GRAY : null;
++            case BLACK -> secondColor.equals(DyeColor.WHITE) ? DyeColor.GRAY : null;
++            default -> null;
++        };
++    }
++
++}

patches/server/features/playerlist/0036-Load-player-data-asynchronously.patch

@@ -18,7 +18,7 @@ index 16069b9cbf6c7679c28a2e9a54e77d23cd10e541..bb10892f33ba0d7fc3959debef104507
      private final byte[] challenge;
      final MinecraftServer server;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 503716bfa3d54c46534738d4209ef1a8ab50f7c3..14dd70f95ed6f6d4f24b509becf764aad60a3df1 100644
+index aead28160c7a5067340ec80a833eafcab1817d67..c18868796957c0756aca3b5a15fd0d0c8a5221f4 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -183,6 +183,16 @@ public abstract class PlayerList {
@@ -56,10 +56,10 @@ index 503716bfa3d54c46534738d4209ef1a8ab50f7c3..14dd70f95ed6f6d4f24b509becf764aa
          // CraftBukkit start - Better rename detection
          if (optional.isPresent()) {
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 2a1dceb5251c67d6a5c60e1b9fb3ef2931055673..4a73bffae1531b42a2718cbe620fe2fc53139c45 100644
+index 14ba63f5ef6ad5d96972b18e1174a8a94491fa57..c2f3facf65aa2682306c64c3466357461a76f267 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -28,6 +28,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -44,6 +44,7 @@ public class GlobalConfiguration extends ConfigurationPart {
      public class Player extends ConfigurationPart {
  
          public boolean checkSpectatorMovedToQuickly = !OPTIMIZE;

patches/server/features/sparklypaper/0032-Reset-dirty-flag-when-loading-maps-from-the-disk.patch

@@ -19,10 +19,10 @@ index 26da9e7c25ef6a89482838010d8ed6bcf8c87511..71aa3b9c5604f832e764e0d7a93da467
      }
  
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 97a2aebc9ba946e4532c66553d9a2e7e7b3139f2..2a1dceb5251c67d6a5c60e1b9fb3ef2931055673 100644
+index a0b1239e302f0366743949a895a0539348817077..14ba63f5ef6ad5d96972b18e1174a8a94491fa57 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -114,6 +114,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -130,6 +130,7 @@ public class GlobalConfiguration extends ConfigurationPart {
      public Miscellaneous misc;
      public class Miscellaneous extends ConfigurationPart {
  

patches/server/features/sparklypaper/0033-Allow-throttling-hopper-checks-if-the-target-contain.patch

@@ -20,7 +20,7 @@ index 5ebbdb94d9b91c442ff60eb6872f740ebd790fa0..aeeb8af68ea43ae6c93952610918d77b
              } else {
                  // Paper start - Perf: Optimize Hoppers
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index 6c9c28ae5fbe62ba647e7790acccb377d1e62490..0618db9893eda1fac0da6b771cc4d456b247d237 100644
+index d366e8755ba91c329164c16659f6b07245577fba..f21ed3431fd8472c78c15578bbd12214c499ceea 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 @@ -64,6 +64,12 @@ public class WorldConfigurations extends ConfigurationPart {

patches/server/features/sparklypaper/0050-Port-minor-SparklyPaper-patches.patch

@@ -0,0 +1,117 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Fri, 13 Dec 2024 21:10:27 +0900
+Subject: [PATCH] Port minor SparklyPaper patches
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
+index 2bec5ed591e658765602379f9065b8089f5df6ea..ddcf301f098bbe55dbef7751180110a22bccc68d 100644
+--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
++++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
+@@ -58,6 +58,7 @@ import org.bukkit.event.player.PlayerVelocityEvent;
+ 
+ public class ServerEntity {
+ 
++    public static boolean PLAZMA_DISTANCE_SQR = false; // Plazma - Port Minor SparklyPaper patches; Skip distanceToSqr if the delta is the same
+     private static final Logger LOGGER = LogUtils.getLogger();
+     private static final int TOLERANCE_LEVEL_ROTATION = 1;
+     private static final double TOLERANCE_LEVEL_POSITION = 7.62939453125E-6D;
+@@ -232,6 +233,7 @@ public class ServerEntity {
+ 
+                     if (this.entity.hasImpulse || this.trackDelta || this.entity instanceof LivingEntity && ((LivingEntity) this.entity).isFallFlying()) {
+                         Vec3 vec3d1 = this.entity.getDeltaMovement();
++                        if (PLAZMA_DISTANCE_SQR || vec3d1 != this.lastSentMovement) { // Plazma - Port Minor SparklyPaper patches; Skip distanceToSqr if the delta is the same
+                         double d0 = vec3d1.distanceToSqr(this.lastSentMovement);
+ 
+                         if (d0 > 1.0E-7D || d0 > 0.0D && vec3d1.lengthSqr() == 0.0D) {
+@@ -246,6 +248,7 @@ public class ServerEntity {
+                                 this.broadcast.accept(new ClientboundSetEntityMotionPacket(this.entity.getId(), this.lastSentMovement));
+                             }
+                         }
++                        } // Plazma - Port Minor SparklyPaper patches; Skip distanceToSqr if the delta is the same
+                     }
+ 
+                     if (packet1 != null) {
+diff --git a/src/main/java/net/minecraft/stats/ServerStatsCounter.java b/src/main/java/net/minecraft/stats/ServerStatsCounter.java
+index da7e1a69ecb4e6b3be2d8544ac406aa519bd196e..ce56fdd0bbe1c95146c88594c68a6a399f01218e 100644
+--- a/src/main/java/net/minecraft/stats/ServerStatsCounter.java
++++ b/src/main/java/net/minecraft/stats/ServerStatsCounter.java
+@@ -90,12 +90,14 @@ public class ServerStatsCounter extends StatsCounter {
+         this.dirty.add(stat);
+     }
+ 
++    /* // Plazma - Port Minor SparklyPaper patches; Skip dirty stats copy when requesting player stats
+     private Set<Stat<?>> getDirty() {
+         Set<Stat<?>> set = Sets.newHashSet(this.dirty);
+ 
+         this.dirty.clear();
+         return set;
+     }
++     */ // Plazma - Port Minor SparklyPaper patches; Skip dirty stats copy when requesting player stats
+ 
+     public void parseLocal(DataFixer dataFixer, String json) {
+         try {
+@@ -242,14 +244,12 @@ public class ServerStatsCounter extends StatsCounter {
+     }
+ 
+     public void sendStats(ServerPlayer player) {
+-        Object2IntMap<Stat<?>> object2intmap = new Object2IntOpenHashMap();
+-        Iterator iterator = this.getDirty().iterator();
++        // Plazma start - Port Minor SparklyPaper patches; Skip dirty stats copy when requesting player stats
++        Object2IntMap<Stat<?>> object2intmap = new Object2IntOpenHashMap<>();
++        for (final Stat<?> stat : this.dirty) object2intmap.put(stat, this.getValue(stat));
+ 
+-        while (iterator.hasNext()) {
+-            Stat<?> statistic = (Stat) iterator.next();
+-
+-            object2intmap.put(statistic, this.getValue(statistic));
+-        }
++        this.dirty.clear();
++        // Plazma end - Port Minor SparklyPaper patches; Skip dirty stats copy when requesting player stats
+ 
+         player.connection.send(new ClientboundAwardStatsPacket(object2intmap));
+     }
+diff --git a/src/main/java/net/minecraft/world/item/MapItem.java b/src/main/java/net/minecraft/world/item/MapItem.java
+index 68a0aa6545c8aba3ecc31086a8d2bc3e1aada64e..4b9fbb4b1ad434ea06a44e30e66c394b07be7b7f 100644
+--- a/src/main/java/net/minecraft/world/item/MapItem.java
++++ b/src/main/java/net/minecraft/world/item/MapItem.java
+@@ -276,7 +276,12 @@ public class MapItem extends Item {
+                     mapItemSavedData.tickCarriedBy(player, stack);
+                 }
+ 
+-                if (!mapItemSavedData.locked && (selected || entity instanceof Player && ((Player)entity).getOffhandItem() == stack)) {
++                // Plazma start - Port Minor SparklyPaper patches; Skip map update if the craft renderer is null
++                if (!mapItemSavedData.locked
++                    && (!world.plazmaConfig().item.skipMapUpdateIfCraftRenderIsNull || mapItemSavedData.mapView.getRenderers().stream().anyMatch(renderer -> renderer instanceof org.bukkit.craftbukkit.map.CraftMapRenderer))
++                    && (selected || entity instanceof Player player && player.getOffhandItem() == stack)
++                ) {
++                // Plazma end - Port Minor SparklyPaper patches; Skip map update if the craft renderer is null
+                     this.update(world, entity, mapItemSavedData);
+                 }
+             }
+diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapColorCache.java b/src/main/java/org/bukkit/craftbukkit/map/CraftMapColorCache.java
+index 8149b9c51b78eb5c689b7218a2ca3aab60e73bcf..125a4f13dbe98976c4cf94bb523463a51bd4f8dd 100644
+--- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapColorCache.java
++++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapColorCache.java
+@@ -145,7 +145,7 @@ public class CraftMapColorCache implements MapPalette.MapColorCache {
+     }
+ 
+     @Override
+-    public boolean isCached() {
++    public synchronized boolean isCached() { // Plazma - Port Minor SparklyPaper patches; Fix concurrency issues when using "imageToBytes" in multiple threads
+         return this.cached || (!this.running.get() && this.initCache().isDone());
+     }
+ 
+diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
+index bbb51ccf2016987202811ee893f855da2612dd17..f6f372644bca9111aa3f45bf7ae8e66e53d11505 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
+@@ -86,6 +86,8 @@ public class WorldConfigurations extends ConfigurationPart {
+     public Item item;
+     public class Item extends ConfigurationPart {
+ 
++        public boolean skipMapUpdateIfCraftRenderIsNull = true;
++
+         public ShootableFireCharge shootableFireCharge;
+         public class ShootableFireCharge extends ConfigurationPart {
+