rebuild patches

.gitignore

@@ -1,64 +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/**/*
-upstream
+# 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.4. If you want to know more about Plazma, please check the **[main branch][main]**.<br>
-해당 페이지는 Plazma의 1.21.4용 분기입니다. 플라즈마에 대해 자세히 알고 싶다면 **[main 분기][main]** 를 확인해주세요.

build-data/dev-imports.txt

@@ -1,17 +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
-#
-
-minecraft net.minecraft.server.commands.PardonCommand
-minecraft net.minecraft.server.commands.PardonIpCommand

build.gradle.kts

@@ -2,132 +2,84 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
-    java
-    `maven-publish`
-    alias(libs.plugins.shadow) apply false
-    alias(libs.plugins.paperweight)
+    id("io.papermc.paperweight.patcher") version "2.0.0-beta.14"
 }
 
-repositories {
-    mavenCentral()
-    maven("https://repo.papermc.io/repository/maven-public/") { name = "papermc"
-        content { onlyForConfigurations(configurations.paperclip.name) }
-    }
-    maven("https://repo.codemc.io/repository/maven-public/") { name = "codemc" }
-    maven("https://jitpack.io") { name = "jitpack" }
-}
-
-dependencies {
-    remapper(libs.remapper)
-    paperclip(libs.paperclip)
-    decompiler(libs.decompiler)
-}
-
-val brandName: String by project
-val providerRepo: String by project
 paperweight {
-    serverProject = project(":${brandName.lowercase()}-server")
+    upstreams.register("purpur") {
+        repo = github("PurpurMC", "Purpur")
+        ref = providers.gradleProperty("purpurRef")
 
-    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"))
+        patchFile {
+            path = "purpur-server/build.gradle.kts"
+            outputFile = file("plazma-server/build.gradle.kts")
+            patchFile = file("plazma-server/build.gradle.kts.patch")
         }
-
-        patchTasks.register("generatedApi") {
-            isBareDirectory = true
-            upstreamDirPath = "paper-api-generator/generated"
-            patchDir = projectDir.resolve("patches/generated-api")
-            outputDir = projectDir.resolve("paper-api-generator/generated")
+        patchFile {
+            path = "purpur-api/build.gradle.kts"
+            outputFile = file("plazma-api/build.gradle.kts")
+            patchFile = file("plazma-api/build.gradle.kts.patch")
         }
-    }
-}
-
-tasks {
-    applyPatches {
-        dependsOn("applyGeneratedApiPatches")
-    }
-
-    rebuildPatches {
-        dependsOn("rebuildGeneratedApiPatches")
-    }
-
-    generateDevelopmentBundle {
-        apiCoordinates.set("${project.group}:${brandName.lowercase()}-api")
-        libraryRepositories.addAll(
-            "https://repo1.maven.org/maven2/",
-            "https://repo.papermc.io/repository/maven-public/",
-            "https://repo.codemc.io/repository/maven-public/",
-            "https://jitpack.io",
-        )
-    }
-}
-
-publishing.publications.create<MavenPublication>("devBundle") {
-    artifact(tasks.generateDevelopmentBundle) {  artifactId = "dev-bundle" }
-}
-
-val mavenUsername: String? by project
-val mavenPassword: String? by project
-allprojects {
-    apply(plugin = "java")
-    apply(plugin = "maven-publish")
-
-    java.toolchain.languageVersion.set(JavaLanguageVersion.of(21))
-
-    publishing.repositories.maven("https://maven.pkg.github.com/$providerRepo") {
-        name = "github"
-
-        credentials {
-            username = mavenUsername ?: System.getenv("GRADLE_PROPERTY_MAVEN_USERNAME") ?: System.getenv("MAVEN_USERNAME")
-            password = mavenPassword ?: System.getenv("GRADLE_PROPERTY_MAVEN_PASSWORD") ?: System.getenv("MAVEN_PASSWORD")
+        patchRepo("paperApi") {
+            upstreamPath = "paper-api"
+            patchesDir = file("plazma-api/paper-patches")
+            outputDir = file("paper-api")
         }
-    }
-
-    publishing.repositories.maven("https://repo.codemc.io/repository/maven-snapshots/") {
-        name = "codemc"
-
-        credentials {
-            username = mavenUsername ?: System.getenv("GRADLE_PROPERTY_MAVEN_USERNAME") ?: System.getenv("MAVEN_USERNAME")
-            password = mavenPassword ?: System.getenv("GRADLE_PROPERTY_MAVEN_PASSWORD") ?: System.getenv("MAVEN_PASSWORD")
+        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 {
-    repositories {
-        mavenCentral()
-        maven("https://repo.papermc.io/repository/maven-public/") { name = "papermc" }
-        maven("https://repo.codemc.io/repository/maven-public/") { name = "codeme" }
-        maven("https://jitpack.io") { name = "jitpack" }
+    apply(plugin = "java-library")
+    apply(plugin = "maven-publish")
+
+    extensions.configure<JavaPluginExtension> {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(21)
+        }
     }
 
-    tasks {
-        withType<JavaCompile>().configureEach {
-            options.encoding = Charsets.UTF_8.name()
-            options.release = 21
-        }
+    repositories {
+        mavenCentral()
+        maven("https://repo.papermc.io/repository/maven-public/")
+    }
 
-        withType<Javadoc> {
-            options.encoding = Charsets.UTF_8.name()
+    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)
         }
+    }
 
-        withType<ProcessResources> {
-            filteringCharset = Charsets.UTF_8.name()
-        }
-
-        withType<Test> {
-            testLogging {
-                showStackTraces = true
-                exceptionFormat = TestExceptionFormat.FULL
-                events(TestLogEvent.STANDARD_OUT)
+    extensions.configure<PublishingExtension> {
+        repositories {
+            /*
+            maven("https://repo.papermc.io/repository/maven-snapshots/") {
+                name = "paperSnapshots"
+                credentials(PasswordCredentials::class)
             }
+             */
         }
     }
 }

gradle.properties

@@ -1,20 +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.4-R0.1-SNAPSHOT
-mcVersion = 1.21.4
-
-paperCommit = b746d9df0b6b7765478b2a72c2d963b6e668fa35
-purpurCommit = f06fd5bb3880e660ecfb43beaadf8ddac175fa8f
+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.7"
-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,136 +0,0 @@
-#!/bin/bash
-# To initialize your development environment,
-# run below command in your terminal:
-# source ./initDev
-
-PROJECT_DIR=$(pwd)
-
-alias cl="clear;"
-
-alias src="cd $PROJECT_DIR;"
-alias ca="cd $PROJECT_DIR/*-API || exit 1; vs;"
-alias cg="cd $PROJECT_DIR/paper-api-generator/generated || exit 1; vs;"
-alias cs="cd $PROJECT_DIR/*-Server || exit 1; vs;"
-
-alias fa="ca __generate_fixup_patch"
-alias fg="cg __generate_fixup_patch"
-alias fs="cs __generate_fixup_patch"
-
-alias gradle="./gradlew" # TODO: Paperweight will not work with Gradle 8.10.2
-alias gr="cd $PROJECT_DIR; gradle"
-alias grc="gr --no-rebuild"
-
-alias ap="grc applyPatches"
-alias aap="grc applyAPIPatches"
-alias agp="grc applyGeneratedAPIPatches"
-alias asp="grc applyServerPatches"
-
-alias aap!="rm -rf $PROJECT_DIR/*-API; aap"
-alias agp!="rm -rf $PROJECT_DIR/paper-api-generator/generated; agp"
-alias asp!="rm -rf $PROJECT_DIR/*-Server; asp"
-
-alias aapa="ca vpa"
-alias aapc="ca vpc"
-alias aapc="ca vps"
-alias agpa="cg vpa"
-alias agpc="cg vpc"
-alias agpc="cg vps"
-alias aspa="cs vpa"
-alias aspc="cs vpc"
-alias aspc="cs vps"
-
-alias rp="grc rebuildPatches"
-alias rap="grc rebuildAPIPatches"
-alias rgp="grc rebuildGeneratedAPIPatches"
-alias rsp="grc rebuildServerPatches"
-
-alias mk="gr build"
-alias mko="gr createReobfPaperclipJar"
-alias mkm="gr createMojmapPaperclipJar"
-
-
-alias va="git add"
-alias va.="git add ."
-
-alias vl="git log --oneline base..HEAD"
-
-alias vr="git rebase --autosquash base"
-alias vra="git rebase --abort"
-alias vrc="va.; git rebase --continue"
-alias vrs="git rebase --skip"
-
-alias vp="git am --show-current-patch"
-alias vpa="git am --abort"
-alias vpc="git am --continue"
-alias vps="git am --skip"
-
-alias vm="git commit --fixup"
-alias vs="git status"
-
-alias vc="git commit --verbose --no-interactive"
-alias vcn="vc --no-message"
-alias vcm="vc --message"
-
-alias vca="git commit --verbose --no-interactive --all"
-alias vcan="git commit --verbose --no-interactive --all --no-message"
-alias vcam="git commit --verbose --no-interactive --all --message"
-
-alias ve="git commit --verbose --no-interactive --amend"
-alias ven="ve --no-message"
-alias vem="ve --message"
-
-alias vea="git commit --verbose --no-interactive --all --amend"
-alias vean="vea --no-message"
-alias veam="vea --message"
-
-alias as="ca src"
-alias al="ca vl"
-alias ac="ca va.; vcm"
-alias am="ca vm"
-alias ae="ca ve"
-alias aea="ca vea"
-alias aean="ca vean"
-alias aeam="ca veam"
-
-alias gs="cg src"
-alias gl="cg vl"
-alias gc="cg va.; vcm"
-alias gm="cg vm"
-alias ge="cg ve"
-alias gea="cg vea"
-alias gean="cg vean"
-alias geam="cg veam"
-
-alias ss="cs src"
-alias sl="cs vl"
-alias sc="cs va.; vcm"
-alias sm="cs vm"
-alias se="cs ve"
-alias sea="cs vea"
-alias sean="cs vean"
-alias seam="cs veam"
-
-function __generate_fixup_patch() {
-    garg="."
-    [[ "$1" == "-x" ]] && garg="--amend"
-
-    git add .
-    git commit "$garg" -m "fixup"
-    git format-patch -1
-    mv 0001-fixup.patch ../ -f
-
-    cd ../
-}
-
-# Commit Updated Upstream
-function cuu() {
-    # shellcheck disable=SC2059
-    printf "Updated Upstream ($1)$(/bin/cat compare.txt)" | git commit -F -
-}
-
-git update-index --assume-unchanged ./build-data/dev-imports.txt
-
-if [ ! -L "$PROJECT_DIR/upstream" ]; then
-    grc applyPatches
-    ln -dsf "$PROJECT_DIR/.gradle/caches/paperweight/upstreams/paper" "$PROJECT_DIR/upstream"
-fi

libs/api.versions.toml

@@ -1,47 +0,0 @@
-[versions]
-brigadier = "1.2.9"
-
-guava = "33.3.1-jre"
-gson = "2.11.0"
-bungeechat = "1.20-R0.2-deprecated+build.19"
-
-# snakeyaml
-joml = "1.10.8"
-json-simple = "1.1.1"
-
-fastutil = "8.5.15"
-# adventure
-# log4j
-slf4j-api = "2.0.9"
-sentry = "5.4.0"
-
-# asm
-# mvn
-
-annotations = "24.1.0"
-checkerqual = "3.21.0"
-jspecify = "1.0.0"
-
-
-[libraries]
-brigadier = { group = "com.mojang", name = "brigadier", version.ref = "brigadier" }
-
-guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
-bungeechat = { group = "net.md-5", name = "bungeecord-chat", version.ref = "bungeechat" }
-
-joml = { group = "org.joml", name = "joml", version.ref = "joml" }
-jsonsimple = { group = "com.googlecode.json-simple", name = "json-simple", version.ref = "json-simple" }
-
-fastutil = { group = "it.unimi.dsi", name = "fastutil", version.ref = "fastutil" }
-slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j-api" }
-sentry = { group = "io.sentry", name = "sentry", version.ref = "sentry" }
-
-annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }
-checkerqual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checkerqual" }
-jspecify = { group = "org.jspecify", name = "jspecify", version.ref = "jspecify" }
-
-
-[bundles]
-api = [ "brigadier", "guava", "gson", "fastutil", "slf4j", "sentry", "jspecify" ]
-annotations = [ "annotations", "checkerqual" ]

libs/common.versions.toml

@@ -1,73 +0,0 @@
-[versions]
-adventure = "4.17.0"
-log4j = "2.24.1"
-asm = "9.7.1"
-
-mvn = "3.9.6"
-mvn-resolver = "1.9.18"
-
-commons-lang2 = "2.6"
-commons-lang3 = "3.12.0"
-
-snakeyaml = "2.2"
-
-junit = "1.10.0"
-junit-jupiter = "5.10.0"
-junit-pioneer = "2.2.0"
-
-hamcrest = "2.2"
-mockito = "5.14.1"
-
-[libraries]
-adventure-bom = { group = "net.kyori", name = "adventure-bom", version.ref = "adventure" }
-adventure-api = { group = "net.kyori", name = "adventure-api", version.ref = "adventure" }
-adventure-minimessage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "adventure" }
-adventure-logger-slf4j = { group = "net.kyori", name = "adventure-text-logger-slf4j", 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" }
-
-log4j = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" }
-log4j-api = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" }
-log4j-stream = { group = "org.apache.logging.log4j", name = "log4j-iostreams", version.ref = "log4j" }
-
-asm = { 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" }
-
-mvn = { group = "org.apache.maven", name = "maven-resolver-provider", version.ref = "mvn" }
-mvn-connector = { group = "org.apache.maven.resolver", name = "maven-resolver-connector-basic", version.ref = "mvn-resolver" }
-mvn-transport = { group = "org.apache.maven.resolver", name = "maven-resolver-transport-http", version.ref = "mvn-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" }
-
-snakeyaml = { group = "org.yaml", name = "snakeyaml", version.ref = "snakeyaml" }
-
-junit = { group = "org.junit.platform", name = "junit-platform-suite-engine", version.ref = "junit" }
-junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "junit-jupiter" }
-junit-pioneer = { group = "org.junit-pioneer", name = "junit-pioneer", version.ref = "junit-pioneer" }
-
-hamcrest = { group = "org.hamcrest", name = "hamcrest", version.ref = "hamcrest" }
-mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
-
-
-[bundles]
-asm = [ "asm", "asm-commons" ]
-mvn = [ "mvn-connector", "mvn-transport" ]
-
-test = [
-    "junit-jupiter",
-    "hamcrest",
-    "mockito",
-    "asm-tree"
-]
-adventure = [
-    "adventure-api",
-    "adventure-minimessage",
-    "adventure-logger-slf4j",
-    "adventure-serializer-gson",
-    "adventure-serializer-plain",
-    "adventure-serializer-legacy"
-]

libs/server.versions.toml

@@ -1,94 +0,0 @@
-[versions]
-concurrentutil = "0.0.2"
-
-jline = "3.27.1"
-tca = "1.3.0"
-# adventure
-# log4j
-netty = "4.1.97.Final"
-# asm
-configurate = "4.2.0-SNAPSHOT"
-# commons2
-sqlite = "3.47.0.0"
-mysql = "9.1.0"
-disruptor = "3.4.4"
-velocity = "3.3.0-SNAPSHOT"
-
-# mvn
-
-# snakeyaml
-simpleyaml = "1.8.4"
-
-rhino = "1.7.14"
-upnp = "1.0"
-
-classgraph = "4.8.47"
-# test (junit, hamcrest, mockito, asm-tree)
-srgutils = "1.0.9"
-art = "2.0.3"
-
-rewriter = "0.0.3"
-spark-api = "0.1-20240720.200737-2"
-spark = "1.10.119-SNAPSHOT"
-
-
-[libraries]
-concurrentutil = { group = "ca.spottedleaf", name = "concurrentutil", version.ref = "concurrentutil" }
-
-jline-ffm = { group = "org.jline", name = "jline-terminal-ffm", version.ref = "jline" }
-jline-jni = { group = "org.jline", name = "jline-terminal-jni", version.ref = "jline" }
-tca = { group = "net.minecrell", name = "terminalconsoleappender", version.ref="tca" }
-# adventure
-# log4j
-netty-haproxy = { group = "io.netty", name = "netty-codec-haproxy", version.ref = "netty" }
-# asm
-configurate-yaml = { group = "org.spongepowered", name = "configurate-yaml", version.ref = "configurate" }
-# commons2
-sqlite = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite" }
-mysql = { group = "com.mysql", name = "mysql-connector-j", version.ref = "mysql" }
-disruptor = { group = "com.lmax", name = "disruptor", version.ref = "disruptor" }
-velocity-native = { group = "com.velocitypowered", name = "velocity-native", version.ref = "velocity" }
-
-# snakeyaml
-simpleyaml = { group = "com.github.carleslc.Simple-YAML", name = "Simple-Yaml", version.ref = "simpleyaml" }
-
-rhino-runtime = { group = "org.mozilla", name = "rhino-runtime", version.ref = "rhino" }
-rhino-engine = { group = "org.mozilla", name = "rhino-engine", version.ref = "rhino" }
-upnp = { group = "dev.omega24", name = "upnp4j", version.ref = "upnp" }
-
-classgraph = { group = "io.github.classgraph", name = "classgraph", version.ref = "classgraph" }
-# test (junit, hamcrest, mockito, asm-tree)
-srgutils = { group = "net.neoforged", name = "srgutils", version.ref = "srgutils" }
-art = { group = "net.neoforged", name = "AutoRenamingTool", version.ref = "art" }
-
-rewriter = { group = "io.papermc", name = "reflection-rewriter", version.ref = "rewriter" }
-rewriter-runtime = { group = "io.papermc", name = "reflection-rewriter-runtime", version.ref = "rewriter" }
-rewriter-proxy = { group = "io.papermc", name = "reflection-rewriter-proxy-generator", version.ref = "rewriter" }
-
-spark-api = { group = "me.lucko", name = "spark-api", version.ref = "spark-api" }
-spark = { group = "me.lucko", name = "spark-paper", version.ref = "spark" }
-
-
-[bundles]
-runtime = [ "sqlite", "mysql", "disruptor" ]
-test = [ "classgraph" ]
-
-implementation = [
-    "concurrentutil",
-    "jline-ffm",
-    "jline-jni",
-    "tca",
-    "netty-haproxy",
-    "configurate-yaml",
-    "velocity-native",
-    "rhino-runtime",
-    "rhino-engine",
-    "upnp",
-    "srgutils",
-    "art",
-    "rewriter",
-    "rewriter-runtime",
-    "rewriter-proxy",
-    "spark-api",
-    "spark"
-]

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

@@ -1,157 +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 49546dfbb4dd006b5a2419908890ba4c2a0e207a..d3c92a382acbf414bf7e704870d252cc88c5d9db 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -9,11 +9,13 @@ java {
-     withJavadocJar()
- }
- 
-+/* // Plazma - Use Gradle Version 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"
-+ */ // Plazma - Use Gradle Version Catalogs
- val apiAndDocs: Configuration by configurations.creating {
-     attributes {
-         attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
-@@ -39,60 +41,31 @@ 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:33.3.1-jre")
--    api("com.google.code.gson:gson:2.11.0")
--    // Paper start - adventure
--    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.19") {
--        exclude("com.google.guava", "guava")
--    }
--    // Paper - adventure
--    api("org.yaml:snakeyaml:2.2")
--    api("org.joml:joml:1.10.8") {
--        isTransitive = false // https://github.com/JOML-CI/JOML/issues/352
--    }
--    // Paper start
--    api("com.googlecode.json-simple:json-simple:1.1.1") {
--        isTransitive = false // includes junit
--    }
--    api("it.unimi.dsi:fastutil:8.5.15")
--    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")
--    mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // Paper - configure mockito agent that is needed in newer java versions
-+    // Plazma start - Use Gradle Version Catalogs
-+    api(api.bundles.api)
-+    api(api.bungeechat) { exclude("com.google.guava", "guava") }
-+    api(common.snakeyaml)
-+    api(api.joml) { isTransitive = false }
-+    api(api.jsonsimple) { isTransitive = false }
-+    apiAndDocs(platform(common.adventure.bom))
-+    apiAndDocs(common.bundles.adventure)
-+    api(common.log4j.api)
-+ 
-+    implementation(common.bundles.asm)
-+ 
-+    api(common.mvn)
-+    compileOnly(common.bundles.mvn)
-+ 
-+    compileOnly(api.annotations)
-+    testCompileOnly(api.annotations)
-+ 
-+    compileOnlyApi(api.checkerqual)
-+    testCompileOnly(api.checkerqual)
-+ 
-+    testImplementation(common.commons.lang3)
-+    testImplementation(common.bundles.test)
-+    mockitoAgent(common.mockito) { isTransitive = false }
-+    // Plazma end
- }
- 
- // Paper start
-@@ -177,27 +150,25 @@ tasks.withType<Javadoc> {
-     options.use()
-     options.isDocFilesSubDirs = true
-     options.links(
--        "https://guava.dev/releases/33.3.1-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.8/index.html",
--        "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0",
--        "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://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://jspecify.dev/docs/api/", //diff on change
-+        "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://javadoc.io/doc/org.yaml/snakeyaml/${common.snakeyaml.orNull?.version}/",
-+        "https://javadoc.io/doc/org.slf4j/slf4j-api/${api.slf4j.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.mvn.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 679f78e07a3a2de745fa237165d0a8db5e086f29..ac24a288fda957546e2832f375bd1c958db8852b 100644
---- a/src/main/java/com/destroystokyo/paper/MaterialTags.java
-+++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java
-@@ -591,6 +591,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/0009-Temporary-javadoc-build-fix.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 15 Dec 2024 13:34:45 +0900
-Subject: [PATCH] Temporary javadoc build fix
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index d3c92a382acbf414bf7e704870d252cc88c5d9db..64639737e96f0a0b41899fef09677a89d319c2eb 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -166,7 +166,7 @@ tasks.withType<Javadoc> {
-         "https://jd.advntr.dev/text-logger-slf4j/${common.adventure.api.orNull?.version}/",
-         "https://javadoc.io/doc/org.yaml/snakeyaml/${common.snakeyaml.orNull?.version}/",
-         "https://javadoc.io/doc/org.slf4j/slf4j-api/${api.slf4j.orNull?.version}/",
--        "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/${common.log4j.api.orNull?.version}/",
-+        "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/2.20.0/", // Plazma - TODO: log4j 2.24.2 javadocs not found
-         "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/${common.mvn.connector.orNull?.version}",
-         // Plazma end
-     )

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,71 +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/server/commands/DebugCommand.java b/src/main/java/net/minecraft/server/commands/DebugCommand.java
-index 06568cc308e06b16f43ec7facd5e2c4e36f3fee9..c3374d11753d8cd152784727bf7ed08d18931136 100644
---- a/src/main/java/net/minecraft/server/commands/DebugCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/DebugCommand.java
-@@ -271,5 +271,12 @@ public class DebugCommand {
-         public void close() {
-             IOUtils.closeQuietly((Writer)this.output);
-         }
-+
-+        // Plazma start - Decompile fixes
-+        @Override
-+        public org.bukkit.command.CommandSender getBukkitSender(final CommandSourceStack wrapper) {
-+            return wrapper.getBukkitSender();
-+        }
-+        // Plazma end - Decompile fixes
-     }
- }
-diff --git a/src/main/java/net/minecraft/server/commands/ReturnCommand.java b/src/main/java/net/minecraft/server/commands/ReturnCommand.java
-index 9f82ca1fee2a319d52a4106c3581f5e9a9554a9e..f5c7748117342dedd9d600881143c206e429fe5b 100644
---- a/src/main/java/net/minecraft/server/commands/ReturnCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/ReturnCommand.java
-@@ -16,18 +16,18 @@ import net.minecraft.commands.execution.tasks.BuildContexts;
- import net.minecraft.commands.execution.tasks.FallthroughTask;
- 
- public class ReturnCommand {
--    public static <T extends ExecutionCommandSource<T>> void register(CommandDispatcher<T> dispatcher) {
--        dispatcher.register(
--            (LiteralArgumentBuilder<T>)LiteralArgumentBuilder.<ExecutionCommandSource>literal("return")
--                .requires(source -> source.hasPermission(2))
--                .then(
--                    RequiredArgumentBuilder.<T, Integer>argument("value", IntegerArgumentType.integer())
--                        .executes(new ReturnCommand.ReturnValueCustomExecutor<>())
--                )
--                .then(LiteralArgumentBuilder.<T>literal("fail").executes(new ReturnCommand.ReturnFailCustomExecutor<>()))
--                .then(LiteralArgumentBuilder.<T>literal("run").forward(dispatcher.getRoot(), new ReturnCommand.ReturnFromCommandCustomModifier<>(), false))
-+
-+    // Plazma start - Decompile fixes
-+    public static void register(CommandDispatcher<net.minecraft.commands.CommandSourceStack> dispatcher) {
-+        dispatcher.register(net.minecraft.commands.Commands.literal("return")
-+            .requires(source -> source.hasPermission(2))
-+            .then(net.minecraft.commands.Commands.argument("value", IntegerArgumentType.integer())
-+                .executes(new ReturnCommand.ReturnValueCustomExecutor<>()))
-+            .then(net.minecraft.commands.Commands.literal("fail").executes(new ReturnCommand.ReturnFailCustomExecutor<>()))
-+            .then(net.minecraft.commands.Commands.literal("run").forward(dispatcher.getRoot(), new ReturnCommand.ReturnFromCommandCustomModifier<>(), false))
-         );
-     }
-+    // Plazma end - Decompile fixes
- 
-     static class ReturnFailCustomExecutor<T extends ExecutionCommandSource<T>> implements CustomCommandExecutor.CommandAdapter<T> {
-         @Override
-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-Minor-code-optimizations.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Fri, 13 Dec 2024 13:54:22 +0900
-Subject: [PATCH] Minor code optimizations
-
-
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 1a808fc381c0c3ea1fc49bbffebddf2c550e817a..55f15f26b56b97a561054b0660ba4965bb008b36 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1698,7 +1698,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
-     @Override
-     public List<Entity> getEntities(@Nullable Entity except, AABB box, Predicate<? super Entity> predicate) {
-         Profiler.get().incrementCounter("getEntities");
--        List<Entity> list = Lists.newArrayList();
-+        //List<Entity> list = Lists.newArrayList(); // Plazma - minor optimizations
- 
-         // Paper start - rewrite chunk system
-         final List<Entity> ret = new java.util.ArrayList<>();

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

@@ -1,129 +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 624588207afdc52adae14e5de3d18fe1c330d832..a40dc8b2560b8cd124d961f3dfd5865efd2a3b9e 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -25,73 +25,35 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
- // Paper end - configure mockito agent that is needed in newer java versions
- 
- dependencies {
--    implementation(project(":purpur-api")) // Pufferfish // Paper // Purpur - Rebrand
--    implementation("ca.spottedleaf:concurrentutil:0.0.2") // Paper - Add ConcurrentUtil dependency
--    // Paper start
--    implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
--    implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
--    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.24.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.47.0.0")
--    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
-+    implementation(project(":${rootProject.providers.gradleProperty("brandName").get().lowercase()}-api")) // Pufferfish // Paper // Purpur // Plazma - Fork-friendly Rebranding
-+    // Plazma start - Use Gradle Version Catalogs
-+    implementation(server.bundles.implementation)
-+    implementation(common.adventure.serializer.ansi)
-+    implementation(common.log4j.stream)
- 
--    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(common.log4j)
-+    log4jPlugins.annotationProcessorConfigurationName(common.log4j)
-+    runtimeOnly(log4jPlugins.output) // diff on change
-+    alsoShade(log4jPlugins.output) // diff on change
- 
--    // Pufferfish start
--    implementation("org.yaml:snakeyaml:1.32")
--    implementation ("com.github.carleslc.Simple-YAML:Simple-Yaml:1.8.4") { // Purpur - Fix pufferfish issues
--        exclude(group="org.yaml", module="snakeyaml")
--    }
--    // Pufferfish end
-+    runtimeOnly(server.bundles.runtime)
-+
-+    implementation(common.bundles.asm)
-+    implementation(common.commons.lang2)
-+    implementation(server.velocity.native) { isTransitive = false }
-+
-+    runtimeOnly(common.mvn)
-+    runtimeOnly(common.bundles.mvn)
- 
--    implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur - Rebrand
--    implementation("org.mozilla:rhino-engine:1.7.14") // Purpur - Rebrand
--    implementation("dev.omega24:upnp4j:1.0") // Purpur - Rebrand
-+    implementation(common.snakeyaml)
-+    implementation(server.simpleyaml) { exclude(group="org.yaml", module="snakeyaml") }
- 
--    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")
--    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.119-SNAPSHOT")
--    // Paper end - spark
-+    testImplementation(server.classgraph)
-+    testImplementation(common.bundles.test)
-+    testImplementation(common.junit)
-+    mockitoAgent(common.mockito) { isTransitive = false }
-+    testImplementation(common.junit.pioneer)
-+    // Plazma end - Use Gradle Version Catalogs
- }
- 
- paperweight {
-@@ -119,14 +81,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 - Rebrand
-+            "Implementation-Title" to rootProject.providers.gradleProperty("brandName").get(), // Pufferfish // Purpur - Rebrand // Plazma - Fork-friendly Rebranding
-             "Implementation-Version" to implementationVersion,
-             "Implementation-Vendor" to date, // Paper
--            "Specification-Title" to "Purpur", // Pufferfish // Purpur - Rebrand
-+            "Specification-Title" to rootProject.providers.gradleProperty("brandName").get(), // Pufferfish // Purpur - Rebrand // Plazma - Fork-friendly Rebranding
-             "Specification-Version" to project.version,
--            "Specification-Vendor" to "Purpur Team", // Pufferfish // Purpur - Rebrand
--            "Brand-Id" to "purpurmc:purpur", // Pufferfish // Purpur - Rebrand
--            "Brand-Name" to "Purpur", // Pufferfish // Purpur - Rebrand
-+            "Specification-Vendor" to rootProject.providers.gradleProperty("providerName").get(), // Purpur - Rebrand // Plazma - Fork-friendly Rebranding
-+            "Brand-Id" to rootProject.providers.gradleProperty("brandKey").get(), // Purpur - Rebrand // Plazma - Fork-friendly Rebranding
-+            "Brand-Name" to rootProject.providers.gradleProperty("brandName").get(), // Pufferfish // Purpur - Rebrand // Plazma - Fork-friendly Rebranding
-             "Build-Number" to (build ?: ""),
-             "Build-Time" to Instant.now().toString(),
-             "Git-Branch" to gitBranch, // Paper

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

@@ -1,425 +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 be1bb14dca9367b9685841985b6198376986c496..b58f4eb26ce6bd6696b3289b5f199ab8f0ff28b6 100644
---- a/src/main/java/com/destroystokyo/paper/Metrics.java
-+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
-@@ -592,7 +592,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 - Purpur config files
-+                Metrics metrics = new Metrics(io.papermc.paper.ServerBrandConstants.BRAND_NAME, serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur - Purpur config files // 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 fe66e43c27e0798770e102d1385bacbaa90bda07..1ad562a95809cf7d503f5446f8645ba8c2680914 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 - Rebrand
--    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 - Rebrand
- 
-@@ -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 - Rebrand
-+            updateMessage = getUpdateStatusMessage("PlazmaMC/Plazma", build); // Purpur - Rebrand // 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 - Rebrand
- 
-         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 - Rebrand
-                 .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 bc7e4e5560708fea89c584b1d8b471f4966f311a..986be14b664e55111a590f5c1fded5a799578da0 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 - Rebrand
-+                .appName(io.papermc.paper.ServerBrandConstants.BRAND_NAME) // Purpur - Rebrand // 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 0843e7c5c335a58d955a0841f2e02a9e4ac824d9..f7c15d0a63f948c4f52f6e6bbcbc4dc096b3281f 100644
---- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-+++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-@@ -30,10 +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_PUFFERFISH_NAME = "Pufferfish"; // Purpur - Fix pufferfish issues
--    private static final String BRAND_PURPUR_NAME = "Purpur"; // Purpur - Rebrand
--
-     private static final String BUILD_DEV = "DEV";
- 
-     public ServerBuildInfoImpl() {
-@@ -44,9 +40,9 @@ public record ServerBuildInfoImpl(
-         this(
-             getManifestAttribute(manifest, ATTRIBUTE_BRAND_ID)
-                 .map(Key::key)
--                .orElse(BRAND_PURPUR_ID), // Purpur - Fix pufferfish issues // Purpur - Rebrand
-+                .orElse(BRAND_ID), // Purpur - Fix pufferfish issues // Purpur - Rebrand // Plazma - Fork-friendly Rebranding
-             getManifestAttribute(manifest, ATTRIBUTE_BRAND_NAME)
--                .orElse(BRAND_PURPUR_NAME), // Purpur - Fix pufferfish issues // Purpur - Rebrand
-+                .orElse(ServerBrandConstants.BRAND_NAME), // Purpur - Fix pufferfish issues // Purpur - Rebrand // Plazma - Fork-friendly Rebranding
-             SharedConstants.getCurrentVersion().getId(),
-             SharedConstants.getCurrentVersion().getName(),
-             getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER)
-@@ -63,7 +59,7 @@ public record ServerBuildInfoImpl(
- 
-     @Override
-     public boolean isBrandCompatible(final @NotNull Key brandId) {
--        return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID) || brandId.equals(BRAND_PUFFERFISH_ID); // Purpur - Fix pufferfish issues // Purpur - Rebrand
-+        return brandId.equals(this.brandId) || SUPPORTED_BRANDS.contains(brandId); // Purpur - Fix pufferfish issues // Purpur - Rebrand // 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 8cf720f08514e8e4f62f4ad196f1277bd761c6b2..cda2ca940e30506807a5d12b84dbf69529051e26 100644
---- a/src/main/java/io/papermc/paper/configuration/Configurations.java
-+++ b/src/main/java/io/papermc/paper/configuration/Configurations.java
-@@ -112,7 +112,7 @@ public abstract class Configurations<G, W> {
-             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);
-+                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); // Plazma - Fork-friendly Rebranding
-             } else throw ex;
-         }
-     }
-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 a880f4e5cf712654649ad043e58e073e9a87c0fe..c3bce9206aee05b18ddd8b2788f892a972146737 100644
---- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
-@@ -110,6 +110,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 fa5f7bc53f3dfa5581f7c747c732ebc7737a7820..17afd1c5b9984b19b4d31711bfd7f8cc120d89fd 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1281,7 +1281,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 0a579af1f1ecd6e73a8440e6821c41338dd28829..b0b79b9d743cca3e6b1a33c592d66d3cdad3d819 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -788,7 +788,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 05e16103af3fd276f0196ddf1a2e5b729b025c34..8f7e922ceca286b1a590181c301fbe9bff55c024 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 3781bca61379516d537650c79c614933454fdcd8..b669721a900c4644a5bc125a83c000af21f43692 100644
---- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-+++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-@@ -90,7 +90,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 a68f27288604b6f6755efe3c8ea612e295cb1656..47d19180ba80615e596e2322db24571868042a93 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
-@@ -289,7 +289,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 - Rebrand
-+        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 - Rebrand // 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 10aa600fab7146b330d46b5fd2fe596da222a70a..9c275f6f2c78c5d78736dc6921eadda2c12a5a10 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");
- 
-@@ -194,7 +194,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 2e7c3d4befeb6256ce81ecaa9ed4e8fbcb21651e..b28b2076972612d3d0b5890cf5938db53b1ceb2f 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 - Rebrand
-+                task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to " + io.papermc.paper.ServerBrandConstants.BRAND_NAME); // Paper // Purpur - Rebrand // 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 99eb04643fce44c37fd96c99756837ccafe7b559..0627428492e082da5dfbd93906d87bb10e8c1a6b 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 - Rebrand
-+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream(io.papermc.paper.ServerBrandConstants.RESOURCE_PATH); // Pufferfish // Purpur - Rebrand // 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 47f168b2d62c9a0eebdd8ab678afd857e7622571..40342e412f3fa0ea76e8f41f5eb9995eff83daa6 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 - Rebrand
-+                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " bug." ); // Paper // Purpur - Rebrand // 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 - Rebrand
-+                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 - Rebrand // 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 - Rebrand
-+                log.log( Level.SEVERE,  io.papermc.paper.ServerBrandConstants.BRAND_NAME + " version: " + Bukkit.getServer().getVersion() ); // Purpur - Rebrand // 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 - Rebrand
-+                    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 - Rebrand // 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 - Rebrand
-+                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + "!):" ); // Paper // Purpur - Rebrand // 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 - Rebrand
-+                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " - THIS IS NOT A BUG OR A CRASH ---"); // Purpur - Rebrand // Plazma - Fork-friendly Rebranding
-                 }
- 
-                 log.log( Level.SEVERE, "------------------------------" );

patches/server/0006-Enable-CI-version-tracking.patch

@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 25 Dec 2024 18:16:50 +0900
-Subject: [PATCH] Enable CI version tracking
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index 1ad562a95809cf7d503f5446f8645ba8c2680914..21a3761f075ace896c981936b2810fccb0b5d610 100644
---- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -90,19 +90,18 @@ public class PaperVersionFetcher implements VersionFetcher {
-         };
-     }
- 
--    /* // Plazma - TODO: CI Checking
-     private static int fetchDistanceFromSiteApi(final ServerBuildInfo build, final int jenkinsBuild) {
-         try {
-             try (final BufferedReader reader = Resources.asCharSource(
--                URI.create("https://api.purpurmc.org/v2/purpur/" + build.minecraftVersionId()).toURL(), // Purpur - Rebrand
-+                URI.create("https://ci.codemc.io/job/PlazmaMC/job/Plazma/job/" + build.gitBranch().orElseThrow().replace("/", "%2F") + "/api/json").toURL(), // Purpur - Rebrand // Plazma - Rebrand
-                 Charsets.UTF_8
-             ).openBufferedStream()) {
-                 final JsonObject json = new Gson().fromJson(reader, JsonObject.class);
-                 //final JsonArray builds = json.getAsJsonArray("builds"); // Purpur - Rebrand
--                final int latest = json.getAsJsonObject("builds").getAsJsonPrimitive("latest").getAsInt(); // Purpur - Rebrand
-+                final int latest = json.getAsJsonObject("lastSuccessfulBuild").getAsJsonPrimitive("number").getAsInt(); // Purpur - Rebrand // Plazma - Rebrand
-                 return latest - jenkinsBuild;
-             } catch (final JsonSyntaxException ex) {
--                LOGGER.error("Error parsing json from Purpur's downloads API", ex); // Purpur - Rebrand
-+                LOGGER.error("Error parsing json from CI", ex); // Purpur - Rebrand // Plazma - Rebrand
-                 return DISTANCE_ERROR;
-             }
-         } catch (final IOException e) {
-@@ -110,7 +109,6 @@ 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) {

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

@@ -1,146 +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 b638690d5cd2360444e6c525f97f634d8e1dc60e..e89534b6e2b91483d7eddfcb3441e9addf9bccc7 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -6,6 +6,7 @@ import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
- import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
- import net.minecraft.Util;
- import org.jetbrains.annotations.NotNull;
-+import org.spongepowered.configurate.objectmapping.meta.PostProcess;
- import org.spongepowered.configurate.objectmapping.meta.Setting;
- import java.util.List;
- 
-@@ -27,4 +28,61 @@ public class GlobalConfiguration extends ConfigurationPart {
-     @Setting(Configuration.VERSION_FIELD)
-     int version = VERSION;
- 
-+    public Messages messages;
-+    public class Messages extends ConfigurationPart {
-+
-+
-+    }
-+
-+    public Command command;
-+    public class Command extends ConfigurationPart {
-+
-+
-+    }
-+
-+    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..c222d58520b655b54b8975ec226a4ba948691cd4 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-@@ -19,4 +19,44 @@ 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 {
-+        
-+
-+    }
-+
-+    public Item item;
-+    public class Item extends ConfigurationPart {
-+
-+
-+    }
-+
- }

patches/server/0010-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 c3bce9206aee05b18ddd8b2788f892a972146737..fc378b08c10c7f670be93d52937c7642b986ed0d 100644
---- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
-@@ -115,6 +115,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/0011-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 b58f4eb26ce6bd6696b3289b5f199ab8f0ff28b6..6ab720b65dec49092addbaf967c77682bd304096 100644
---- a/src/main/java/com/destroystokyo/paper/Metrics.java
-+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
-@@ -635,38 +635,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/0014-Tweak-console-logging.patch

@@ -1,91 +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 14fd0ff2b4dc226f2890e538587226cdb60d37c2..32ebee3620b5ec1ff57b92a581fb2d7f5dfe17cf 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()) {
-@@ -344,6 +343,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.");
-@@ -357,7 +357,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 5b1705794a8c3914cb11fdd35f75c8e0c128ecd0..459eea7dae68afdf7e1443f29f6f8d0c68668b74 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 e89534b6e2b91483d7eddfcb3441e9addf9bccc7..3a9fa2ac6dc5eaa153deb06a005be51c59786bbe 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -85,4 +85,14 @@ 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/0018-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 305a569f8cd83f3c67a4d4377f2881d36961dacd..8001ae563ac06d8ba9fd1de0b4111a3c8241de8c 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2332,8 +2332,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();
-@@ -2361,8 +2362,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-                         entity.push(d0, 0.0D, d1);
-                     }
-                 }
--
--            }
-+            //} // Plazma - Swaps the predicate order of collision
-         }
-     }
- 

patches/server/0019-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 c703237d46b114227cf0d5cdff2e033839bc5f57..a976e2b960a5f3b7ecf6e42afcb1dd3bd140b8bd 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/0020-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 c783c17d45beda8297171d0834350197808a7335..611de28d27d75b73e33a552c8a23d6c0f53582da 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1749,7 +1749,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 f99a281244f7b736bd979cfc0bcd0787d9da9a42..6d313edc60082a5f2d30ef8ad9fbd57772f361fe 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -43,6 +43,7 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public Player player;
-     public class Player extends ConfigurationPart {
- 
-+        public boolean checkSpectatorMovedToQuickly = !OPTIMIZE;
- 
-     }
- 

patches/server/0022-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 0be6582e50ccc94036bb6782a5f811c0f9c42f01..98b08a2e83cf1c4e1e45a42ddcad2198f42a05e2 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -951,10 +951,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
-         ProfilerFiller gameprofilerfiller = Profiler.get();
- 
-         gameprofilerfiller.push("sensing");
--        this.sensing.tick();
-+        //this.sensing.tick(); // Plazma - moved down
-         gameprofilerfiller.pop();
-         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");
-             if (this.targetSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index a976e2b960a5f3b7ecf6e42afcb1dd3bd140b8bd..9e408d6c1826d36a935b3e382e8eb0283f3d1580 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/0027-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 e64ff857bf95436033baf38db1e6895f75856f9c..f029cdfe3d1e1b13a0cc3bf04e7285907c02a9a8 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2832,6 +2832,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/0029-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 a40dc8b2560b8cd124d961f3dfd5865efd2a3b9e..e4dfd79840913e776a84bacda776329cb32e2be9 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -164,7 +164,7 @@ fun TaskContainer.registerRunTask(
-         languageVersion.set(JavaLanguageVersion.of(21))
-         vendor.set(JvmVendorSpec.JETBRAINS)
-     })
--    jvmArgs("-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods")
-+    jvmArgs("-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods", "--add-modules=jdk.incubator.vector", "-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/0030-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 82bded015da16ed2feae1161a31f916804c6fbbb..657f118713b2188cb2e7fe5ec3be455189b50623 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1628,29 +1628,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/0034-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 f029cdfe3d1e1b13a0cc3bf04e7285907c02a9a8..684e747255472b85a573e004f85e0319e2145d8e 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1390,7 +1390,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()) {
-@@ -1399,7 +1400,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 f21ed3431fd8472c78c15578bbd12214c499ceea..9cfab16b9cdf40ccb709c0af66c406954560c0ef 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/0038-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 c2f3facf65aa2682306c64c3466357461a76f267..8914159c17b3c8b0114e88c5317df5f17b05e5d6 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -145,4 +145,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/0039-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 0e27e4a1f767842d1dcd2ed235a6a45f120bf32e..c1d4a96cf5be77f4460c54ed19622f527d42ca06 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/0040-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/0059-Tick-toggle-subcommand.patch

@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sat, 14 Dec 2024 11:06:41 +0900
-Subject: [PATCH] Tick toggle subcommand
-
-
-diff --git a/src/main/java/net/minecraft/server/commands/TickCommand.java b/src/main/java/net/minecraft/server/commands/TickCommand.java
-index 13d96b54f48d60b098b80e04ba6168762c335c75..5aab945085eb4ed2ea44832319c6daad96fe3a71 100644
---- a/src/main/java/net/minecraft/server/commands/TickCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/TickCommand.java
-@@ -21,6 +21,10 @@ public class TickCommand {
-         dispatcher.register(
-             Commands.literal("tick")
-                 .requires(source -> source.hasPermission(3))
-+                // Plazma start - Tick toggle subcommand
-+                .executes(context -> toggleFreeze(context.getSource()))
-+                .then(Commands.literal("toggle").executes(context -> toggleFreeze(context.getSource())))
-+                // Plazma end - Tick toggle subcommand
-                 .then(Commands.literal("query").executes(context -> tickQuery(context.getSource())))
-                 .then(
-                     Commands.literal("rate")
-@@ -108,6 +112,14 @@ public class TickCommand {
-         return 1;
-     }
- 
-+    // Plazma start - Tick toggle subcommand
-+    private static int toggleFreeze(CommandSourceStack source) {
-+        ServerTickRateManager serverTickRateManager = source.getServer().tickRateManager();
-+        boolean frozen = !serverTickRateManager.isFrozen();
-+        return setFreeze(source, frozen);
-+    }
-+    // Plazma end - Tick toggle subcommand
-+
-     private static int setFreeze(CommandSourceStack source, boolean frozen) {
-         ServerTickRateManager serverTickRateManager = source.getServer().tickRateManager();
-         if (frozen) {

patches/server/0060-Add-options-to-modify-configurations-path.patch

@@ -1,263 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 25 Dec 2024 13:24:51 +0900
-Subject: [PATCH] Add options to modify configurations path
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index 21a3761f075ace896c981936b2810fccb0b5d610..d99adf4a0b430b8a1ae41d3f4f04ad0c7a6e7eaa 100644
---- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -135,7 +135,7 @@ public class PaperVersionFetcher implements VersionFetcher {
-     }
- 
-     private @Nullable Component getHistory() {
--        final VersionHistoryManager.@Nullable VersionData data = VersionHistoryManager.INSTANCE.getVersionData();
-+        final VersionHistoryManager.@Nullable VersionData data = VersionHistoryManager.getInstance().getVersionData(); // Plazma - Add options to modify the configuration files
-         if (data == null) {
-             return null;
-         }
-diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
-index 660b2ec6b63a4ceffee44ab11f54dfa7c0d0996f..aa936d21bd458deef5672ddd782897c41daa765e 100644
---- a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
-+++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
-@@ -19,8 +19,24 @@ import org.bukkit.Bukkit;
- import javax.annotation.Nonnull;
- import javax.annotation.Nullable;
- 
--public enum VersionHistoryManager {
--    INSTANCE;
-+// Plazma start - Add options to modify the configuration files
-+public final class VersionHistoryManager {
-+    private static VersionHistoryManager INSTANCE;
-+
-+    public static VersionHistoryManager getInstance() {
-+        if (INSTANCE == null) {
-+            throw new IllegalStateException("VersionHistoryManager has not been initialized yet");
-+        }
-+        return INSTANCE;
-+    }
-+
-+    public static void initialize(final joptsimple.OptionSet options) {
-+        if (INSTANCE != null) {
-+            throw new IllegalStateException("VersionHistoryManager has already been initialized");
-+        }
-+        INSTANCE = new VersionHistoryManager((java.io.File) options.valueOf("version-history"));
-+    }
-+    // Plazma end - Add options to modify the configuration files
- 
-     private final Gson gson = new Gson();
- 
-@@ -28,8 +44,10 @@ public enum VersionHistoryManager {
- 
-     private VersionData currentData = null;
- 
--    VersionHistoryManager() {
--        final Path path = Paths.get("version_history.json");
-+    // Plazma start - Add options to modify the configuration files
-+    private VersionHistoryManager(final @Nonnull java.io.File file) {
-+        final Path path = file.toPath();
-+        // Plazma end - Add options to modify the configuration files
- 
-         if (Files.exists(path)) {
-             // Basic file santiy checks
-diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java
-index 06323dcc745aed16123980fc559d7b65c42f1e1c..ee37957264b7830c29a72f76ef4d7729bc66040c 100644
---- a/src/main/java/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java
-+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java
-@@ -117,7 +117,7 @@ public class PufferfishVersionFetcher implements VersionFetcher {
- 	}
- 	
- 	private @Nullable Component getHistory() {
--		final VersionHistoryManager.VersionData data = VersionHistoryManager.INSTANCE.getVersionData();
-+		final VersionHistoryManager.VersionData data = VersionHistoryManager.getInstance().getVersionData(); // Plazma - Add options to modify the configuration files
- 		if (data == null) {
- 			return null;
- 		}
-@@ -129,4 +129,4 @@ public class PufferfishVersionFetcher implements VersionFetcher {
- 		
- 		return Component.text("Previous version: " + oldVersion, NamedTextColor.GRAY, TextDecoration.ITALIC);
- 	}
--}
-\ No newline at end of file
-+}
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 3e211e6ea16c8110e662d6201e8325ecd3d6a93b..011cdc8dbef3e823bdccf1a1c7cf945cf0cf7005 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -256,7 +256,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         }
-         org.purpurmc.purpur.PurpurConfig.registerCommands();
-         // Purpur end - Purpur config files
--        com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
-+        com.destroystokyo.paper.VersionHistoryManager.initialize(this.options); // Paper - load version history now // Plazma - Add options to modify the configuration files
-         gg.pufferfish.pufferfish.PufferfishConfig.pufferfishFile = (java.io.File) options.valueOf("pufferfish-settings"); // Purpur - Fix pufferfish issues
-         gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish
-         gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish
-diff --git a/src/main/java/net/minecraft/server/players/OldUsersConverter.java b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
-index 1f2958d21c279ecb377b7c90ba643ea83e217eca..6a411f609c48b28115b947494062f9f7bf5b2d93 100644
---- a/src/main/java/net/minecraft/server/players/OldUsersConverter.java
-+++ b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
-@@ -82,7 +82,7 @@ public class OldUsersConverter {
-     }
- 
-     public static boolean convertUserBanlist(final MinecraftServer server) {
--        final UserBanList gameprofilebanlist = new UserBanList(PlayerList.USERBANLIST_FILE);
-+        final UserBanList gameprofilebanlist = new UserBanList((File) server.options.valueOf("banned-players")); // Plazma - Configurable player list file path
- 
-         if (OldUsersConverter.OLD_USERBANLIST.exists() && OldUsersConverter.OLD_USERBANLIST.isFile()) {
-             if (gameprofilebanlist.getFile().exists()) {
-@@ -140,7 +140,7 @@ public class OldUsersConverter {
-     }
- 
-     public static boolean convertIpBanlist(MinecraftServer server) {
--        IpBanList ipbanlist = new IpBanList(PlayerList.IPBANLIST_FILE);
-+        IpBanList ipbanlist = new IpBanList((File) server.options.valueOf("banned-ips")); // Plazma - Configurable player list file path
- 
-         if (OldUsersConverter.OLD_IPBANLIST.exists() && OldUsersConverter.OLD_IPBANLIST.isFile()) {
-             if (ipbanlist.getFile().exists()) {
-@@ -181,7 +181,7 @@ public class OldUsersConverter {
-     }
- 
-     public static boolean convertOpsList(final MinecraftServer server) {
--        final ServerOpList oplist = new ServerOpList(PlayerList.OPLIST_FILE);
-+        final ServerOpList oplist = new ServerOpList((File) server.options.valueOf("ops")); // Plazma - Configurable player list file path
- 
-         if (OldUsersConverter.OLD_OPLIST.exists() && OldUsersConverter.OLD_OPLIST.isFile()) {
-             if (oplist.getFile().exists()) {
-@@ -225,7 +225,7 @@ public class OldUsersConverter {
-     }
- 
-     public static boolean convertWhiteList(final MinecraftServer server) {
--        final UserWhiteList whitelist = new UserWhiteList(PlayerList.WHITELIST_FILE);
-+        final UserWhiteList whitelist = new UserWhiteList((File) server.options.valueOf("whitelist")); // Plazma - Configurable player list file path
- 
-         if (OldUsersConverter.OLD_WHITELIST.exists() && OldUsersConverter.OLD_WHITELIST.isFile()) {
-             if (whitelist.getFile().exists()) {
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d5d09bf63f4b7fba73188f75d5fe9599b8da2844..8ab6df63d9a22ac76b2ba14bc8fef318e65484c8 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -126,10 +126,12 @@ import org.bukkit.event.player.PlayerSpawnChangeEvent;
- 
- public abstract class PlayerList {
- 
-+    /* // Plazma - Configurable player list file path
-     public static final File USERBANLIST_FILE = new File("banned-players.json");
-     public static final File IPBANLIST_FILE = new File("banned-ips.json");
-     public static final File OPLIST_FILE = new File("ops.json");
-     public static final File WHITELIST_FILE = new File("whitelist.json");
-+     */ // Plazma - Configurable player list file path
-     public static final Component CHAT_FILTERED_FULL = Component.translatable("chat.filtered_full");
-     public static final Component DUPLICATE_LOGIN_DISCONNECT_MESSAGE = Component.translatable("multiplayer.disconnect.duplicate_login");
-     private static final Logger LOGGER = LogUtils.getLogger();
-@@ -167,14 +169,12 @@ public abstract class PlayerList {
-         server.console = new com.destroystokyo.paper.console.TerminalConsoleCommandSender(); // Paper
-         // CraftBukkit end
- 
--        this.bans = new UserBanList(PlayerList.USERBANLIST_FILE);
--        this.ipBans = new IpBanList(PlayerList.IPBANLIST_FILE);
--        this.ops = new ServerOpList(PlayerList.OPLIST_FILE);
--        this.whitelist = new UserWhiteList(PlayerList.WHITELIST_FILE);
--        // CraftBukkit start
--        // this.stats = Maps.newHashMap();
--        // this.advancements = Maps.newHashMap();
--        // CraftBukkit end
-+        // Plazma start - Configurable player list file path
-+        this.bans = new UserBanList((File) server.options.valueOf("banned-players"));
-+        this.ipBans = new IpBanList((File) server.options.valueOf("banned-ips"));
-+        this.ops = new ServerOpList((File) server.options.valueOf("ops"));
-+        this.whitelist = new UserWhiteList((File) server.options.valueOf("whitelist"));
-+        // Plazma end - Configurable player list file path
-         this.server = server;
-         this.registries = registryManager;
-         this.maxPlayers = maxPlayers;
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 15527e902484496a6804c879d1de589bed3f8713..b2f924d0236683dc0a994350efe9a9db54b2ab98 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -276,12 +276,12 @@ public final class CraftServer implements Server {
-     private final ServicesManager servicesManager = new SimpleServicesManager();
-     private final CraftScheduler scheduler = new CraftScheduler();
-     private final CraftCommandMap commandMap; // Paper - Move down
--    private final SimpleHelpMap helpMap = new SimpleHelpMap(this);
-+    private final SimpleHelpMap helpMap;
-     private final StandardMessenger messenger = new StandardMessenger();
-     private final SimplePluginManager pluginManager; // Paper - Move down
-     public final io.papermc.paper.plugin.manager.PaperPluginManagerImpl paperPluginManager; // Paper
-     private final StructureManager structureManager;
--    protected final DedicatedServer console;
-+    public final DedicatedServer console; // Plazma - AT (protected -> public)
-     protected final DedicatedPlayerList playerList;
-     private final Map<String, World> worlds = new LinkedHashMap<String, World>();
-     // private final Map<Class<?>, Registry<?>> registries = new HashMap<>(); // Paper - replace with RegistryAccess
-@@ -421,6 +421,7 @@ public final class CraftServer implements Server {
- 
-         Bukkit.setServer(this);
-         // Paper start
-+        this.helpMap = new SimpleHelpMap(this); // Plazma - Add options to modify the configuration files
-         this.commandMap = new CraftCommandMap(this);
-         this.pluginManager = new SimplePluginManager(this, commandMap);
-         this.paperPluginManager = new io.papermc.paper.plugin.manager.PaperPluginManagerImpl(this, this.commandMap, pluginManager);
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index a75f3328ba32466b6ceeddb0069c856524f19c0a..913213c77fa2cf8038768a34b38bb59d698e714b 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -205,6 +205,44 @@ public class Main {
-                     .defaultsTo(new File(org.plazmamc.plazma.configurations.PlazmaConfigurations.CONFIG_DIR))
-                     .describedAs("Configuration Directory");
-                 // Plazma end - Configurable Plazma
-+
-+                // Plazma start - Configurable player data storage
-+                acceptsAll(asList("banned-ips"), "File for banned IPs")
-+                    .withRequiredArg()
-+                    .ofType(File.class)
-+                    .defaultsTo(new File("banned-ips.json"))
-+                    .describedAs("JSON file");
-+
-+                acceptsAll(asList("banned-players"), "File for banned players")
-+                    .withRequiredArg()
-+                    .ofType(File.class)
-+                    .defaultsTo(new File("banned-players.json"))
-+                    .describedAs("JSON file");
-+
-+                acceptsAll(asList("ops"), "File for ops")
-+                    .withRequiredArg()
-+                    .ofType(File.class)
-+                    .defaultsTo(new File("ops.json"))
-+                    .describedAs("JSON file");
-+
-+                acceptsAll(asList("whitelist"), "File for whitelist")
-+                    .withRequiredArg()
-+                    .ofType(File.class)
-+                    .defaultsTo(new File("whitelist.json"))
-+                    .describedAs("JSON file");
-+
-+                acceptsAll(asList("version-history"), "File for version history")
-+                    .withRequiredArg()
-+                    .ofType(File.class)
-+                    .defaultsTo(new File("version_history.json"))
-+                    .describedAs("JSON file");
-+
-+                acceptsAll(asList("help"), "File for help command")
-+                    .withRequiredArg()
-+                    .ofType(File.class)
-+                    .defaultsTo(new File("help.yml"))
-+                    .describedAs("Yaml file");
-+                // Plazma end - Configurable player data storage
-             }
-         };
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java b/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java
-index 5923d3c17756c489fcb392044c0679fe52e2d58f..3ec5cf874dfd9d2e016daa9f7c7aee2646e67861 100644
---- a/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java
-+++ b/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java
-@@ -25,7 +25,7 @@ public class HelpYamlReader {
-     public HelpYamlReader(Server server) {
-         this.server = server;
- 
--        File helpYamlFile = new File("help.yml");
-+        File helpYamlFile = (File) ((org.bukkit.craftbukkit.CraftServer) server).console.options.valueOf("help"); // Plazma - Add options to modify the configuration files
-         YamlConfiguration defaultConfig = YamlConfiguration.loadConfiguration(new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream("configurations/help.yml"), Charsets.UTF_8));
- 
-         try {

patches/server/0063-Add-heal-command.patch

@@ -1,122 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 25 Dec 2024 19:07:19 +0900
-Subject: [PATCH] Add heal command
-
-
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index c416b1eaf27699de59aaa6b352ff1aa991d3f660..90ecfc550324521a7aece274bab330f8dc2de3f3 100644
---- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -180,6 +180,7 @@ public class Commands {
-             org.purpurmc.purpur.command.CompassCommand.register(this.dispatcher); // Purpur
-             org.purpurmc.purpur.command.RamBarCommand.register(this.dispatcher); // Purpur - Implement ram and rambar commands
-             org.purpurmc.purpur.command.RamCommand.register(this.dispatcher); // Purpur - Implement ram and rambar commands
-+            org.plazmamc.plazma.commands.HealCommand.register(this.dispatcher); // Plazma - Add heal command
-         }
- 
-         if (environment.includeIntegrated) {
-diff --git a/src/main/java/org/plazmamc/plazma/commands/HealCommand.java b/src/main/java/org/plazmamc/plazma/commands/HealCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..b10725af7ec4433e98557cfbafb563822cd4f908
---- /dev/null
-+++ b/src/main/java/org/plazmamc/plazma/commands/HealCommand.java
-@@ -0,0 +1,66 @@
-+package org.plazmamc.plazma.commands;
-+
-+import com.mojang.brigadier.CommandDispatcher;
-+import com.mojang.brigadier.exceptions.CommandSyntaxException;
-+import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
-+import io.papermc.paper.adventure.PaperAdventure;
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.TextComponent;
-+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
-+import net.minecraft.commands.CommandSourceStack;
-+import net.minecraft.commands.Commands;
-+import net.minecraft.commands.arguments.EntityArgument;
-+import net.minecraft.world.entity.Entity;
-+import net.minecraft.world.entity.LivingEntity;
-+import net.minecraft.world.entity.player.Player;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+import org.jetbrains.annotations.Contract;
-+import org.plazmamc.plazma.configurations.GlobalConfiguration;
-+import java.util.ArrayList;
-+import java.util.Collection;
-+import java.util.Collections;
-+
-+import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage;
-+
-+@DefaultQualifier(NonNull.class)
-+public class HealCommand {
-+
-+    public static void register(final CommandDispatcher<CommandSourceStack> dispatcher) {
-+        dispatcher.register(Commands.literal("heal")
-+            .requires(source -> source.hasPermission(2, "bukkit.command.heal"))
-+            .executes(ctx -> execute(ctx.getSource(), Collections.singleton(ctx.getSource().getEntityOrException())))
-+            .then(Commands.argument("targets", EntityArgument.entities())
-+                .requires(source -> source.hasPermission(3, "bukkit.command.heal.others"))
-+                .executes(ctx -> execute(ctx.getSource(), EntityArgument.getEntities(ctx, "targets")))
-+            )
-+        );
-+    }
-+
-+    @Contract(pure = true)
-+    private static int execute(final CommandSourceStack sender, Collection<? extends Entity> targets) throws CommandSyntaxException {
-+        final ArrayList<Component> success = new ArrayList<>();
-+
-+        for (Entity target : targets) {
-+            if (!(target instanceof LivingEntity entity)) continue;
-+            if (entity.isDeadOrDying()) continue;
-+
-+            entity.heal(entity.getMaxHealth());
-+            success.add(PaperAdventure.asAdventure(entity.getDisplayName()));
-+
-+            if (!(entity instanceof Player player)) continue;
-+            player.getFoodData().setFoodLevel(20);
-+            player.getFoodData().setSaturation(5.0F);
-+        }
-+
-+        if (success.isEmpty()) {
-+            throw new SimpleCommandExceptionType(PaperAdventure.asVanilla(miniMessage().deserialize(GlobalConfiguration.get().messages.heal.noTargets))).create();
-+        }
-+
-+        final Component successJoined = success.stream().reduce((a, b) -> a.append(Component.text(", ").append(b))).orElseThrow();
-+
-+        sender.sendSuccess(miniMessage().deserialize(GlobalConfiguration.get().messages.heal.healed, Placeholder.component("targets", successJoined)));
-+        return success.size();
-+    }
-+
-+}
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 898f9e6ec6f306a15639ee0d03bcfe7bf55e2c6c..02a164ff2c855864e246dcaaf8186274421edea7 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -31,6 +31,13 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public Messages messages;
-     public class Messages extends ConfigurationPart {
- 
-+        public Heal heal;
-+        public class Heal extends ConfigurationPart {
-+
-+            public String healed = "Healed %s";
-+            public String noTargets = "No targets matched selector";
-+
-+        }
- 
-     }
- 
-diff --git a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java
-index 180c0a532bbac10a8280b63eb7aa783a1bfbb237..75ddd1a811d0a07c6fe5431a527b3a74e52ad53a 100644
---- a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java
-+++ b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java
-@@ -78,7 +78,8 @@ public class MinecraftCommandPermissionsTest {
-         "minecraft.command.gamemode.survival",
-         "minecraft.command.gamemode.survival.other",
-         // Purpur end
--        "minecraft.command.selector"
-+        "minecraft.command.selector",
-+        "minecraft.command.heal" // Plazma
-     );
- 
-     private static Set<String> collectMinecraftCommandPerms() {

patches/server/0065-Add-missing-argument-place-for-compass-command.patch

@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 25 Dec 2024 19:10:40 +0900
-Subject: [PATCH] Add missing argument place for /compass command
-
-
-diff --git a/src/main/java/org/purpurmc/purpur/command/CompassCommand.java b/src/main/java/org/purpurmc/purpur/command/CompassCommand.java
-index 79b8490832d2a0cc7846ddcb091cb6bcac74ea45..bc4bdb86dc9a8f454058e0e9555e0af6f70d6b37 100644
---- a/src/main/java/org/purpurmc/purpur/command/CompassCommand.java
-+++ b/src/main/java/org/purpurmc/purpur/command/CompassCommand.java
-@@ -22,6 +22,24 @@ public class CompassCommand {
-                     }
-                     return 1;
-                 })
-+                // Plazma start - Add missing argument place for /compass command
-+                .then(Commands.argument("targets", net.minecraft.commands.arguments.EntityArgument.players())
-+                        .requires(listener -> listener.hasPermission(2, "bukkit.command.compass.other"))
-+                        .executes(context -> {
-+                            for (ServerPlayer player : net.minecraft.commands.arguments.EntityArgument.getPlayers(context, "targets")) {
-+                                CompassTask task = CompassTask.instance();
-+                                if (player.compassBar()) {
-+                                    task.removePlayer(player.getBukkitEntity());
-+                                    player.compassBar(false);
-+                                } else {
-+                                    task.addPlayer(player.getBukkitEntity());
-+                                    player.compassBar(true);
-+                                }
-+                            }
-+                            return net.minecraft.commands.arguments.EntityArgument.getPlayers(context, "targets").size();
-+                        })
-+                )
-+                // Plazma end - Add missing argument place for /compass command
-         );
-     }
- }

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

@@ -8,6 +8,18 @@ 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