publish api

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

.editorconfig

@@ -8,6 +8,8 @@ ij_any_block_comment_add_space = false
 ij_any_block_comment_at_first_column = false
 ij_any_line_comment_at_first_column = false
 ij_any_line_comment_add_space = true
+max_line_length = 120
+ij_visual_guides = 16, 80
 
 [*.tiny]
 indent_style=tab
@@ -17,6 +19,7 @@ end_of_line=crlf
 
 [*.yml]
 indent_size=2
+ij_visual_guides = 8, 80
 
 [*.patch]
 trim_trailing_whitespace=false
@@ -30,10 +33,7 @@ ij_java_imports_layout = *,|,$*
 ij_java_generate_final_locals = true
 ij_java_generate_final_parameters = true
 
-[test-plugin/**/*.java]
+[*-Server/src/main/resources/data/**/*.json]
-ij_java_use_fq_class_names = false
-
-[Paper-Server/src/main/resources/data/**/*.json]
 indent_size = 2
 
 [paper-api-generator/generated/**/*.java]

.gitattributes

@@ -0,0 +1,7 @@
+* text=auto eol=lf
+
+*.sh text eol=lf
+gradlew text eol=lf
+*.bat text eol=crlf
+
+*.jar binary

.github/workflows/gradle.yml

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

.github/workflows/release.yaml

@@ -0,0 +1,12 @@
+name: Release Plazma
+
+on:
+  push:
+    branches: [ "ver/*", "dev/*", "feat/**/*" ]
+  workflow_dispatch:
+
+jobs:
+  release:
+    name: Release Plazma (${{ github.ref_name }})
+    uses: PlazmaMC/PlazmaBukkit/.github/workflows/global.yaml@main
+    secrets: inherit

.github/workflows/release.yml

@@ -1,141 +0,0 @@
-name: Release Plazma (1.20.4)
-
-on:
-  push:
-    branches: [ "ver/*", "dev/*", "feat/**/*" ]
-    paths:
-      - "**.patch"
-  workflow_dispatch:
-
-env:
-  ORG_NAME: PlazmaMC
-  MC_VERSION: 1.20.4
-
-jobs:
-  release:
-    name: Release Plazma
-    strategy:
-      matrix:
-        base_jdk: [17]
-        os: [ubuntu-22.04]
-
-    if: "!startsWith(github.event.commits[0].message, '[CI-Skip]')"
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Setup Variables
-        id: setup
-        env:
-          BRANCH: ${{ github.ref_name }}
-        run: echo "branch=${BRANCH##*/}" >> $GITHUB_OUTPUT
-    
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Checkout javadocs
-        uses: actions/checkout@v4
-        continue-on-error: true
-        if: startsWith(github.ref_name, 'ver/') || startsWith(github.ref_name, 'dev/')
-        with:
-          repository: PlazmaMC/Javadocs
-          path: javadoc
-          ref: ${{ steps.setup.outputs.branch }}
-          token: ${{ secrets.GH_PAT }}
-
-      - name: Checkout javadocs
-        uses: actions/checkout@v4
-        if: startsWith(github.ref_name, 'ver/') || startsWith(github.ref_name, 'dev/')
-        with:
-          repository: PlazmaMC/Javadocs
-          path: jdmain
-          token: ${{ secrets.GH_PAT }}
-
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Set up GraalVM ${{ matrix.base_jdk }}
-        uses: graalvm/setup-graalvm@v1
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          java-version: ${{ matrix.base_jdk }}
-          version: latest
-          cache: 'gradle'
-
-      - name: Configure Git
-        run: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" && git config --global user.name "github-actions[bot]"
-
-      - name: Apply Patches
-        run: ./gradlew applyPatches --stacktrace
-
-      - name: Build
-        run: ./gradlew build --stacktrace
-
-      - name: Create Reobf Jar
-        run: ./gradlew createReobfPaperclipJar --stacktrace
-
-      - name: Create Mojmap Jar
-        run: ./gradlew createMojmapPaperclipJar --stacktrace
-
-      - name: Update Javadoc
-        if: startsWith(github.ref_name, 'ver/') || startsWith(github.ref_name, 'dev/')
-        continue-on-error: true
-        run: |
-          if [ ! -d "javadoc" ]; then
-            mkdir javadoc
-            cd javadoc
-            git init && git branch -m ${{ steps.setup.outputs.branch }}
-            git remote add origin https://github.com/PlazmaMC/Javadocs
-          fi
-          
-          (cd Plazma-API/build/docs/javadoc && tar c .) | (cd javadoc && tar xf -)
-          cd javadoc
-          git add . && git commit -m "Update Javadocs"
-          git push -f
-
-          cd ../jdmain
-          git submodule update
-          git add . && git commit -m "Update Javadocs"
-          git push
-
-      - name: Publish Packages
-        if: startsWith(github.ref_name, 'ver/') || startsWith(github.ref_name, 'dev/')
-        run: |
-          export GITHUB_USERNAME=${{ env.ORG_NAME }}
-          export GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
-          ./gradlew publish --stacktrace
-      
-      - name: Get Release Number
-        if: startsWith(github.ref_name, 'ver/')
-        run: echo "RELEASE=$(git ls-remote --tags origin | grep "build/${{ env.MC_VERSION }}" | wc -l)" >> $GITHUB_ENV
-
-      - name: Release Artifacts
-        if: startsWith(github.ref_name, 'ver/')
-        uses: softprops/action-gh-release@v0.1.15
-        with:
-          name: "Build #${{ env.RELEASE }} for ${{ env.MC_VERSION }}"
-          tag_name: build/${{ env.MC_VERSION }}/${{ env.RELEASE }}
-          target_commitish: ${{ github.ref_name }}
-          generate_release_notes: true
-          fail_on_unmatched_files: true
-          files: build/libs/*.jar
-          
-      - name: Release Artifacts (Latest/Stable)
-        if: startsWith(github.ref_name, 'ver/')
-        uses: softprops/action-gh-release@v0.1.15
-        with:
-          name: "Build #${{ env.RELEASE }} for ${{ env.MC_VERSION }}"
-          tag_name: build/${{ env.MC_VERSION }}/latest
-          target_commitish: ${{ github.ref_name }}
-          generate_release_notes: true
-          fail_on_unmatched_files: true
-          files: build/libs/*.jar
-
-      - name: Release Artifacts (Latest/Development)
-        if: startsWith(github.ref_name, 'dev/')
-        uses: softprops/action-gh-release@v0.1.15
-        with:
-          name: "Development Build for ${{ env.MC_VERSION }}"
-          tag_name: build/${{ env.MC_VERSION }}/latest
-          target_commitish: ${{ github.ref_name }}
-          generate_release_notes: true
-          fail_on_unmatched_files: true
-          files: build/libs/*.jar

.gitignore

@@ -18,11 +18,16 @@ out/
 nbproject/
 nbactions.xml
 
+# vscode
+.vscode/
+
 # Gradle
 !gradle-wrapper.jar
 .gradle/
 build/
 */build/
+run/
+javadoc/
 
 # we use maven!
 build.xml
@@ -47,13 +52,13 @@ manifest.mf
 # Linux temp files
 *~
 
-# other stuff
+# Paperweight
-run/
-javadoc/
-
 build-data/
 *-API
 *-MojangAPI
 *-Server
 paper-api-generator
 compare.txt
+*.patch
+!patches/**/*
+upstream

README.md

@@ -4,35 +4,21 @@
 
 ### A Server Platform for Minecraft: Java Edition based on [Paper](https://github.com/PaperMC/Paper)
 
-[![Discord](https://img.shields.io/discord/1083716853928558652?style=for-the-badge&logo=discord&logoColor=ffffff&label=DISCORD&color=5865F2&link=https%3A%2F%2Fdiscord.gg%2FMmfC52K8A8)](https://discord.gg/MmfC52K8A8)
+[![Discord](https://api.plazmamc.org/internal/cdn/discord)](https://plazmamc.org/discord)
-[![Build Status](https://img.shields.io/github/actions/workflow/status/PlazmaMC/Plazma/build.yml?branch=ver/1.20.4&logo=GoogleAnalytics&style=for-the-badge&logoColor=ffffff)](https://github.com/PlazmaMC/Plazma/actions/workflows/build.yml?query=branch:ver/1.20.4)
+[![License](https://api.plazmamc.org/internal/cdn/license)](LICENSE.md)
-[![MC Version](https://img.shields.io/badge/MC-1.20.4-6047ff?&logo=Webpack&style=for-the-badge&logoColor=ffffff)](https://github.com/PlazmaMC/Plazma/releases/build/1.20.4/latest)
+[![Version](https://badge.plazmamc.org/1/MC/1.21.3/Webpack)](https://plazmamc.org/downloads)
 
-[![License](https://img.shields.io/github/license/PlazmaMC/Plazma?logo=github&style=flat-square&logoColor=ffffff)](LICENSE)
+[![Downloads](https://api.plazmamc.org/internal/cdn/dlcountmini)](https://plazmamc.org/downloads)
-[![Downloads](https://img.shields.io/github/downloads/PlazmaMC/Plazma/total?label=Downloads&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAbvSURBVHhe7Z3vixVlFMf3jj9KLC0tqAgJlIoQSjOIIqggwohsCylxrYzU1BfZf7D1IvoLsiIqCwxXqQzCF722N0a+sEKo0BXXosLW1QpX3dvnzHOuuD9m5pm7M/Pc2Xs+cHhmnjnPr/Ode3Zm7o/tqRvNZjMaGxvbgH2L/at2EOuTY+pmlAEBnkug91EmMYDNVnejaAj+my7OqfSru1EkBH8Bdk6DnMYwfvO0WcdTp5y5qtFozNftNBZi97vNzqdOAizS0ofFWnY8tRGAs7+hm5nk8Q2NXbYFxgQIjAkQGBMgMCZAYEyAwJgAgTEBAmMCBMYECIwJEBgTIDAmQGBMgMCYAIExAQJjAgTGBAiMCRAYEyAwJkBgTIDAmACBMQECYwIExgQIjAkQGBMgMCZAYEyAwJgAgTEBAmMCBMYECIwJEJjSBWg2m7PHxsZWYs9gj2AL9FDHIXPDHsV6sRUydz1UT1jEauyX+Nu7CvtnKfqxOermBf5rpb0na7WZF/jPYV5vYP+45g6ZO/aEutULJr4Ou6RrmQTHvqDwFgHfUgTAV37+4EvXbDIcu4g9p+71gHnfxKTlTE8Fn88p5mqzVPArXADGvwpLDP4VDGM3aLNCKeVvAJNd12g0rtHdRPDpxXdAAqFVlcG4Ivwe5rDG1aSyEP8+3S6Usv4I36NlJhqAPSww19+E6SDBx/Z6Br/FCi0LpSMuQyUQBERE8EpH00FebYwzwJhPaVVQyhLgsJbeEJDS05EK7Jt2JvK9loVSlgC7Wew53fZGA1NKOtIzP2/aiaHdMMWnbq9YShEgiqI/KDYx8Uuuxh8JEO0KTUf6qpIzP3faYR4XKV5lTaddTY1g4RuxiywiN7Tbr4GLoaqty1C25Tpf7jlyI3PHXtau6oksAEu8IUuDdnKNHqcjytwCUKbeZKVBOwn+Rumn9rCQV2RBurZc0C6+WcNyCUA7uclq98y/gNX7zJ8IC5puOpKfpfQC3/VY96adJGRhWLvp6JRuZoLvkG7mgnYzJ+0kwQLbTkdlwpxmXtpJQs6yThJB5tI1wW8hC8baSkdFosGf2WknCRYeNB0xdveknSTk7AshgozZ9cFvIYHAKktHGvzOTDvMT94fnUdZ6aNqxqwkHTFG5WmHYeUn9yWmyQ8ZcZBPLuzD/sbkN/mPY2/R6Hp1KR3GKzUdSd8yhg5XOoy1iGHfphzEJKansb3YSnVxUPEiNuXCqZfGS9W1dBirlHSk63tJhykdiRk26EYfD/Wj2IaWo5z5F/TYlHD8MEVln5FhvELTkawPqyztMKQ8BDziRp8ajp/H7hZn+a8TmeD8rPZfCYxXSDqSPqQv7bYSGNb3weGALPQv3UkFv53af2Uw5rTSEW0rTTstJFZuBung96dc6fj+Ln+e3+8vhCiKPqTYwlxzv7NGG3kna3Oj0fjY1VSKb6wWR0zQ67f2ff2KBhE+oMj19qb6blEBKydPTCu91m8XAvkRxWZ51bqaZDT4m0IFPy+1EEDwSUcci9OOClYLaiOAQGAlHa3HzsQV45G6vrqc+S28BeDs6oj/y0KA5SMrS7HXsU+o2kW5g3KZHIudApMrVlwKjdIgE/y+1iZGBsTqgIYtFfzOyytAPvXlw21aGikQVzn7b3d7mQyLACfddibLUKxjv17UKSCAfI9gidvLZEgEOOq20+GSVT4qmOurP13KGmLl+9zsqAjwndv2YgcKz9JtYwIam9fcnheH5A+GfBvQG/y3a2NjAhIbDZMX+C8X1eRrpCdcVTb4yn80vVfHNBTich/2n4tSNvjKt0cb8ixI7h53uW6ywX8+DQ/QwSqt6nok+BQHiM3VrsaL3fg34y0CuoROUt+UmYiojW1j0/tmbqbB2mcRg+0SizgonmjsbtZuHFS8r8dzQbsjmDy3v5HdjrhbLhNZo6wVk3ftUt/1SoJ272l3PZcDRqUocpSXRVvX+vQrqWwQ+5k+4u8IxwdmCKypwZKuZVNuspaw29ZbtPQxQts7sN9lf9wZiwhbOfCO7holgABboyh6V3fHC8DBCNuPCE9qlVEgGtte7HJ2mJSzcboOO4jTXVplFAAx/YHiQc7+EVfjmHQFQ+Dl4dzjNDjmaozpQiyPU6yeGHxhyktIHE8ixMM0/EmrjDbRM/8hiamrGU/iNTwCnMAeoIOvtMrICbHbTyFpJ/GJc+pNFAKcwZ6mI7nhOqvVRgbEakRiRux6p0o7V+J946T3Cf3YC3Sc55a7ayDo5ynksU4/gf8trszAW4AWCHELxTbseYSo7EO7nQyB/5XiM2wngT8VV3qSW4AWDCp3hsvZfAyTB3N3YrdiCxGm9J+dCQHrHaWQq8QhTN7IOoR9w3p/xNq48+/p+R+4L+/7RtGOvAAAAABJRU5ErkJggg==&style=flat-square&color=green)](https://github.com/PlazmaMC/Plazma/releases)
+[![Stargazers](https://api.plazmamc.org/internal/cdn/starsmini)](https://github.com/PlazmaMC/Plazma/stargazers)
-[![Stargazers](https://img.shields.io/github/stars/PlazmaMC/Plazma?label=stars&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABhWlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bxSIVh1YQcYhQnSyIiuimVShChVArtOpgcukXNGlIUlwcBdeCgx+LVQcXZ10dXAVB8APE0clJ0UVK/F9SaBHjwXE/3t173L0D/PUyU82OMUDVLCOViAuZ7KrQ9YogwujDEGYkZupzopiE5/i6h4+vdzGe5X3uz9Gj5EwG+ATiWaYbFvEG8dSmpXPeJ46woqQQnxOPGnRB4keuyy6/cS447OeZESOdmieOEAuFNpbbmBUNlXiSOKqoGuX7My4rnLc4q+Uqa96TvzCU01aWuU5zEAksYgkiBMioooQyLMRo1UgxkaL9uId/wPGL5JLJVQIjxwIqUCE5fvA/+N2tmZ8Yd5NCcaDzxbY/hoGuXaBRs+3vY9tunACBZ+BKa/krdWD6k/RaS4seAb3bwMV1S5P3gMsdoP9JlwzJkQI0/fk88H5G35QFwrdA95rbW3Mfpw9AmrpK3gAHh8BIgbLXPd4dbO/t3zPN/n4Ax9dyyerighsAAAAGYktHRAAAAAAAAPlDu38AAAAJcEhZcwAADdcAAA3XAUIom3gAAAAHdElNRQfmCBMVNjtc7/hFAAABIElEQVQ4y62SzS5DURSFv6smXkAUCRU0UdKYGNTPyCsYYOYFGGi8Ao9QM0PxCh6CgQ4qfiLpBFEjdKCfySaXtDch1uScs9Ze62TvcyAD6o66zV+gjqpvalsd61XXl5GxBySx3/3t7UPqi1pTD9VXdaRbbZIyDQLTwBSwBqzGGaABnAInwCXQSJLk/tO4orb8jra6nwo/CC6NlrqMOq421Y5aVSfUXJe2cqFVo7b5NdwIuVaf1IWM2cyrD+qdOvlTLERIS53pYi6FdqMWet2wGP1tdNE2Q1vK+gfDsdbDlFfzwV3Ems8KmAXegcd4hSvgVq0Bz6GV0ob+HgF1YAA4Cn4LWA9tLusHnscTHavFFF8MrqOeZQVU1HKGXlYr/Cc+AKuOI2h/Jrf7AAAAAElFTkSuQmCC&style=flat-square&color=green)](https://github.com/PlazmaMC/Plazma/stargazers)
+[![Forks](https://api.plazmamc.org/internal/cdn/forks)](https://github.com/PlazmaMC/Plazma/forks)
-[![Forks](https://img.shields.io/github/forks/PlazmaMC/Plazma?label=forks&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABhWlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bxSIVh1YQcYhQnSyIiuimVShChVArtOpgcukXNGlIUlwcBdeCgx+LVQcXZ10dXAVB8APE0clJ0UVK/F9SaBHjwXE/3t173L0D/PUyU82OMUDVLCOViAuZ7KrQ9YogwujDEGYkZupzopiE5/i6h4+vdzGe5X3uz9Gj5EwG+ATiWaYbFvEG8dSmpXPeJ46woqQQnxOPGnRB4keuyy6/cS447OeZESOdmieOEAuFNpbbmBUNlXiSOKqoGuX7My4rnLc4q+Uqa96TvzCU01aWuU5zEAksYgkiBMioooQyLMRo1UgxkaL9uId/wPGL5JLJVQIjxwIqUCE5fvA/+N2tmZ8Yd5NCcaDzxbY/hoGuXaBRs+3vY9tunACBZ+BKa/krdWD6k/RaS4seAb3bwMV1S5P3gMsdoP9JlwzJkQI0/fk88H5G35QFwrdA95rbW3Mfpw9AmrpK3gAHh8BIgbLXPd4dbO/t3zPN/n4Ax9dyyerighsAAAAGYktHRAAAAAAAAPlDu38AAAAJcEhZcwAADdcAAA3XAUIom3gAAAAHdElNRQfmCBMVNCYN3/YeAAAA/UlEQVQ4y7WTQUoDQRBFf01czlJcxUyOINGjjAvFHMFzZGdygOwDwTtk6UZcqLlAxCAuMigug89FamIzdAIN+qGhq/6v6qrqbumvAJwBj8AHMAQs4DJgBHy65jSW4Bl4AaZsUAbcufumrnmquSzIcSzpTtLA7XbA1fuBa9qxCob8YgUUAdcFqoC/iSXIgLELOhG+49w4nM+2BTP7ljR3M4/MufbNzYxdN1E0Sm2ialZnsVIllZKOJF24eyLpXdKtmS1S3sYMmO3THOwJziUdbrbkZvaVcnILeAh6vweylAQ9D7z2BXCS0sJS0lrSpdtrSW+pn6sPLIFX4Er/hR9C0wl1FTBzNwAAAABJRU5ErkJggg==&style=flat-square&color=green)](https://github.com/PPlazmaMC/Plazma/network/members)
+[![Watchers](https://api.plazmamc.org/internal/cdn/watches)](https://github.com/PlazmaMC/Plazma/watchers)
-[![Watchers](https://img.shields.io/github/watchers/PlazmaMC/Plazma?label=watchers&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABhWlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bxSIVh1YQcYhQnSyIiuimVShChVArtOpgcukXNGlIUlwcBdeCgx+LVQcXZ10dXAVB8APE0clJ0UVK/F9SaBHjwXE/3t173L0D/PUyU82OMUDVLCOViAuZ7KrQ9YogwujDEGYkZupzopiE5/i6h4+vdzGe5X3uz9Gj5EwG+ATiWaYbFvEG8dSmpXPeJ46woqQQnxOPGnRB4keuyy6/cS447OeZESOdmieOEAuFNpbbmBUNlXiSOKqoGuX7My4rnLc4q+Uqa96TvzCU01aWuU5zEAksYgkiBMioooQyLMRo1UgxkaL9uId/wPGL5JLJVQIjxwIqUCE5fvA/+N2tmZ8Yd5NCcaDzxbY/hoGuXaBRs+3vY9tunACBZ+BKa/krdWD6k/RaS4seAb3bwMV1S5P3gMsdoP9JlwzJkQI0/fk88H5G35QFwrdA95rbW3Mfpw9AmrpK3gAHh8BIgbLXPd4dbO/t3zPN/n4Ax9dyyerighsAAAAGYktHRAAAAAAAAPlDu38AAAAJcEhZcwAADdcAAA3XAUIom3gAAAAHdElNRQfmCBMVNw4TRw0nAAAA3UlEQVQ4y83SP04CURAG8I0lewHOwAFUaiwkdmAlp8CL4FHopfIvtOIJWE3opIBK489mQPKy6xYWOskkL9/MN/PNzMuyf2fIcYkZVuGzwPI68gle8Yl7jMIfAntBp4o8wAeecFgSP8I8cgZp8DwC12j8oLCBCd7R34ItbHCzT8ZZSC7QTYrcYo1WhjGWaCbdCt+2SGLN4IwPfnu07QjrkhG6oWKB0+TMd7sRAuzHYuqWmO8tsVd1xjmOS8htPEfORVWHTmweHnEVPg2sqPxIicxhFFjhLd7D2q/8J/YFHSJt9VSqQ08AAAAASUVORK5CYII=&style=flat-square&color=green)](https://github.com/PlazmaMC/Plazma/watchers)
+
+### [⬇️ Downloads](https://plazmamc.org/downloads)
 
 </div>
 
-[main]: https://github.com/PlazmaMC/Plazma
+[main]: https://github.com/PlazmaMC/PlazmaBukkit/blob/main/README.md
 
 > [!IMPORTANT]
-This is the branch for Plazma 1.20.4. If you want to know more about Plazma, please check the **[main branch][main]**.<br>
+This is the branch for Plazma 1.21.2/3. If you want to know more about Plazma, please check the **[main branch][main]**.<br>
-이곳은 플라즈마의 1.20.4용 분기입니다. 플라즈마에 대해 자세히 알고 싶다면 **[main 분기][main]** 를 확인해주세요.
+이곳은 플라즈마의 1.21.2/3용 분기입니다. 플라즈마에 대해 자세히 알고 싶다면 **[main 분기][main]** 를 확인해주세요.
-
-## ⬇️ Downloads
-> [!NOTE]
-If you don't know about Mojmap or Bundler, download **Reobf Paperclip**<br>
-Mojmap 또는 Bundler에 대해 잘 알지 못한다면, **Reobf Paperclip**을 사용하세요
-
-<!--- LINKS --->
-[paperReobf]: https://github.com/PlazmaMC/Plazma/releases/download/build/1.20.4/latest/plazma-paperclip-1.20.4-R0.1-SNAPSHOT-reobf.jar
-[paperMojmap]: https://github.com/PlazmaMC/Plazma/releases/download/build/1.20.4/latest/plazma-paperclip-1.20.4-R0.1-SNAPSHOT-mojmap.jar
-[bundlerReobf]: https://github.com/PlazmaMC/Plazma/releases/download/build/1.20.4/latest/plazma-bundler-1.20.4-R0.1-SNAPSHOT-reobf.jar
-[bundlerMojmap]: https://github.com/PlazmaMC/Plazma/releases/download/build/1.20.4/latest/plazma-bundler-1.20.4-R0.1-SNAPSHOT-mojmap.jar
-
-| **Reobf Paperclip (Default)** |    Mojmap Paperclip     |      Reobf Bundler       |      Mojmap Bundler       |
-|:-----------------------------:|:-----------------------:|:------------------------:|:-------------------------:|
-|    [Download][paperReobf]     | [Download][paperMojmap] | [Download][bundlerReobf] | [Download][bundlerMojmap] |

build-data/dev-imports.txt

@@ -12,4 +12,3 @@
 #     mc_data chat_type/chat.json
 #     mc_data dimension_type/overworld.json
 #
-

build.gradle.kts

@@ -3,129 +3,62 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
     java
-    `maven-publish`
     `kotlin-dsl`
+    `maven-publish`
     `always-up-to-date`
     alias(libs.plugins.shadow) apply false
     alias(libs.plugins.paperweight)
 }
 
-kotlin.jvmToolchain {
+val jdkVersion = property("jdkVersion").toString().toInt()
-    languageVersion = JavaLanguageVersion.of(17)
+kotlin.jvmToolchain(jdkVersion)
-}
 
 repositories {
     mavenCentral()
-    maven("https://papermc.io/repo/repository/maven-public/") {
+    maven("https://repo.papermc.io/repository/maven-public/") { name = "papermc"
-        content {
+        content { onlyForConfigurations(configurations.paperclip.name) }
-            onlyForConfigurations(configurations.paperclip.name)
-        }
     }
+    maven("https://repo.codemc.io/repository/maven-public/") { name = "codemc" }
+    maven("https://jitpack.io") { name = "jitpack" }
 }
 
 dependencies {
     remapper(libs.remapper)
-    decompiler(libs.decompiler)
     paperclip(libs.paperclip)
+    decompiler(libs.decompiler)
 }
 
-allprojects {
+val brandName: String by project
-    apply(plugin = "java")
+val providerRepo: String by project
-    apply(plugin = "maven-publish")
-
-    java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
-
-    publishing {
-        repositories {
-            maven {
-                name = "githubPackage"
-                url = uri("https://maven.pkg.github.com/PlazmaMC/PlazmaBukkit")
-
-                credentials {
-                    username = System.getenv("GITHUB_USERNAME")
-                    password = System.getenv("GITHUB_TOKEN")
-                }
-            }
-
-            publications.register<MavenPublication>("gpr") {
-                from(components["java"])
-            }
-        }
-    }
-}
-
-subprojects {
-    tasks {
-        withType<JavaCompile>().configureEach {
-            options.compilerArgs.addAll(listOf("--add-modules=jdk.incubator.vector", "-Xmaxwarns", "1"))
-            options.encoding = Charsets.UTF_8.name()
-            options.release = 17
-        }
-    
-        withType<Javadoc> {
-            options.encoding = Charsets.UTF_8.name()
-        }
-    
-        withType<ProcessResources> {
-            filteringCharset = Charsets.UTF_8.name()
-        }
-    
-        withType<Test> {
-            testLogging {
-                showStackTraces = true
-                exceptionFormat = TestExceptionFormat.FULL
-                events(TestLogEvent.STANDARD_OUT)
-            }
-        }
-    }
-
-    repositories {
-        mavenCentral()
-        maven("https://jitpack.io")
-        maven("https://papermc.io/repo/repository/maven-public/")
-    }
-}
-
 paperweight {
-    serverProject = project(":plazma-server")
+    serverProject = project(":${brandName.lowercase()}-server")
 
     remapRepo = "https://repo.papermc.io/repository/maven-public/"
     decompileRepo = "https://repo.papermc.io/repository/maven-public/"
 
-    usePaperUpstream(providers.gradleProperty("paperCommit")) {
+    useStandardUpstream("paper") {
-        withPaperPatcher {
+        url = github("PaperMC", "Paper-archive")
-            apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
+        ref = providers.gradleProperty("paperCommit")
-            apiOutputDir.set(layout.projectDirectory.dir("Plazma-API"))
 
-            serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
+        withStandardPatcher {
-            serverOutputDir.set(layout.projectDirectory.dir("Plazma-Server"))
+            baseName("Paper")
+
+            apiPatchDir.set(projectDir.resolve("patches/api"))
+            apiOutputDir.set(projectDir.resolve("$brandName-API"))
+
+            serverPatchDir.set(projectDir.resolve("patches/server"))
+            serverOutputDir.set(projectDir.resolve("$brandName-Server"))
         }
 
         patchTasks.register("generatedApi") {
             isBareDirectory = true
             upstreamDirPath = "paper-api-generator/generated"
-            patchDir = layout.projectDirectory.dir("patches/generated-api")
+            patchDir = projectDir.resolve("patches/generated-api")
-            outputDir = layout.projectDirectory.dir("paper-api-generator/generated")
+            outputDir = projectDir.resolve("paper-api-generator/generated")
-        }
-
-        patchTasks.register("mojangApi") {
-            isBareDirectory = true
-            upstreamDirPath = "Paper-MojangAPI"
-            patchDir = layout.projectDirectory.dir("patches/mojang-api")
-            outputDir = layout.projectDirectory.dir("Plazma-MojangAPI")
         }
     }
 }
 
-alwaysUpToDate {
-    paperRepository.set("https://github.com/PaperMC/Paper")
-    paperBranch.set("master")
-    purpurRepository.set("https://github.com/PurpurMC/Purpur")
-    purpurBranch.set("ver/1.20.4")
-    pufferfishRepository.set("https://github.com/pufferfish-gg/Pufferfish")
-    pufferfishBranch.set("ver/1.20")
-}
-
 tasks {
     applyPatches {
         dependsOn("applyGeneratedApiPatches")
@@ -136,20 +69,98 @@ tasks {
     }
 
     generateDevelopmentBundle {
-        apiCoordinates.set("org.plazmamc.plazma:plazma-api")
+        apiCoordinates.set("${project.group}:${brandName.lowercase()}-api")
-        mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi")
         libraryRepositories.addAll(
-                "https://repo.maven.apache.org/maven2/",
+            "https://repo1.maven.org/maven2/",
-                "https://maven.pkg.github.com/PlazmaMC/Plazma",
+            "https://papermc.io/repo/repository/maven-public/",
-                "https://papermc.io/repo/repository/maven-public/"
+            "https://repo.codemc.io/repository/maven-public/",
+            "https://jitpack.io",
         )
     }
 }
 
-publishing {
+publishing.publications.create<MavenPublication>("devBundle") {
-    publications.create<MavenPublication>("devBundle") {
+    artifact(tasks.generateDevelopmentBundle) {  artifactId = "dev-bundle" }
-        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(jdkVersion))
+
+    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")
+        }
+    }
+
+    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")
         }
     }
 }
+
+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" }
+    }
+
+    tasks {
+        withType<JavaCompile>().configureEach {
+            options.encoding = Charsets.UTF_8.name()
+            options.release = jdkVersion
+        }
+
+        withType<Javadoc> {
+            options.encoding = Charsets.UTF_8.name()
+        }
+
+        withType<ProcessResources> {
+            filteringCharset = Charsets.UTF_8.name()
+        }
+
+        withType<Test> {
+            testLogging {
+                showStackTraces = true
+                exceptionFormat = TestExceptionFormat.FULL
+                events(TestLogEvent.STANDARD_OUT)
+            }
+        }
+    }
+}
+
+val paperRepoVal = property("paperRepo").toString()
+val paperBranch = property("paperBranch").toString()
+val purpurRepoVal = property("purpurRepo").toString()
+val purpurBranch = property("purpurBranch").toString()
+val pufferfishRepoVal = property("pufferfishRepo").toString()
+val pufferfishBranch = property("pufferfishBranch").toString()
+val isUsePufferfish = property("usePufferfish").toString().toBoolean()
+alwaysUpToDate {
+
+    paperRepo.set(paperRepoVal)
+    paperRef.set(paperBranch)
+    paperCommitName.set("paperCommit")
+
+    purpurRepo.set(purpurRepoVal)
+    purpurRef.set(purpurBranch)
+    purpurCommitName.set("purpurCommit")
+
+    pufferfishRepo.set(pufferfishRepoVal)
+    pufferfishRef.set(pufferfishBranch)
+    usePufferfish.set(isUsePufferfish)
+
+}

buildSrc/build.gradle.kts

@@ -1,20 +1,18 @@
 plugins {
     java
     `kotlin-dsl`
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    id("com.gradleup.shadow") version "8.3.5"
 }
 
+kotlin.jvmToolchain(21)
+
 repositories {
     mavenCentral()
     maven("https://papermc.io/repo/repository/maven-public/")
 }
 
-kotlin.jvmToolchain {
-    languageVersion = JavaLanguageVersion.of(17)
-}
-
 dependencies {
-    shadow("io.papermc.paperweight:paperweight-patcher:1.5.11-SNAPSHOT")
+    shadow("io.papermc.paperweight:paperweight-patcher:1.6.2-SNAPSHOT")
 }
 
 tasks {

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

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

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

@@ -4,13 +4,17 @@ import org.gradle.api.provider.Property
 
 interface AlwaysUpToDateExtension {
 
-    val paperRepository: Property<String>
+    val paperRepo: Property<String>
-    val paperBranch: Property<String>
+    val paperRef: Property<String>
 
-    val pufferfishRepository: Property<String>
+    val purpurRepo: Property<String>
-    val pufferfishBranch: Property<String>
+    val purpurRef: Property<String>
 
-    val purpurRepository: Property<String>
+    val pufferfishRepo: Property<String>
-    val purpurBranch: Property<String>
+    val pufferfishRef: Property<String>
+    val usePufferfish: Property<Boolean>
+
+    val paperCommitName: Property<String>
+    val purpurCommitName: Property<String>
 
 }

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

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

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

@@ -1,64 +0,0 @@
-package org.plazmamc.alwaysuptodate.tasks
-
-import io.papermc.paperweight.util.Git
-import io.papermc.paperweight.util.fromJson
-import io.papermc.paperweight.util.gson
-import org.gradle.api.Project
-import org.gradle.api.tasks.TaskAction
-import org.gradle.kotlin.dsl.get
-import org.plazmamc.alwaysuptodate.AlwaysUpToDateException
-import org.plazmamc.alwaysuptodate.AlwaysUpToDateExtension
-import org.plazmamc.alwaysuptodate.utils.pathIO
-import paper.libs.com.google.gson.JsonObject
-import java.net.URI
-
-abstract class CheckPaperCommitTask : Task() {
-
-    private val property = project.extensions["alwaysUpToDate"] as AlwaysUpToDateExtension
-
-    @TaskAction
-    fun check() {
-        println(project.checkCommit(property.paperRepository.get(), property.paperBranch.get(), "paperCommit"))
-    }
-
-}
-
-abstract class CheckPurpurCommitTask : Task() {
-
-    private val property = project.extensions["alwaysUpToDate"] as AlwaysUpToDateExtension
-
-    @TaskAction
-    fun check() {
-        println(project.checkCommit(property.purpurRepository.get(), property.purpurBranch.get(), "purpurCommit"))
-    }
-
-}
-
-fun Project.getLatest(repository: String, branch: String) : String {
-    val regex = "[a-z0-9]{40}\trefs/heads/$branch".toRegex()
-
-    return Git(project.pathIO)("ls-remote", repository).readText()?.lines()
-        ?.filterNot { regex.matches(it) }?.first()?.split("\t")?.first()
-        ?: throw AlwaysUpToDateException("Failed to get latest Purpur commit")
-}
-
-fun Project.checkCommit(repository: String, branch: String, propertyName: String) : Boolean {
-    val latestCommit = project.getLatest(repository, branch)
-    val currentCommit = project.properties[propertyName] as String
-
-    return currentCommit == latestCommit
-}
-
-fun Project.createCompareComment(repository: String, branch: String, before: String, clear: Boolean = false) {
-    val builder = StringBuilder()
-    val rawRepo = URI.create(repository).path.substring(1)
-
-    if (!clear) builder.append(project.file("compare.txt").readText())
-    builder.append("\n\n[${rawRepo.split("/").last()} Changes]")
-
-    gson.fromJson<JsonObject>(URI.create("https://api.github.com/repos/$rawRepo/compare/$before...$branch").toURL().readText())["commits"].asJsonArray.forEach {
-        val commit = it.asJsonObject
-        builder.append("$rawRepo@${commit["sha"].asString.subSequence(0, 7)}: ${commit["commit"].asJsonObject["message"].asString.split("\n")[0]}\n")
-    }
-    project.file("compare.txt").writeText(builder.toString())
-}

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

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

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

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

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

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

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

@@ -1,44 +0,0 @@
-package org.plazmamc.alwaysuptodate.tasks
-
-import io.papermc.paperweight.util.Git
-import org.gradle.api.tasks.TaskAction
-import org.gradle.kotlin.dsl.get
-import org.plazmamc.alwaysuptodate.AlwaysUpToDateException
-import org.plazmamc.alwaysuptodate.AlwaysUpToDateExtension
-import java.io.File
-
-abstract class PaperUpdateTask : Task() {
-
-    private val property = project.extensions["alwaysUpToDate"] as AlwaysUpToDateExtension
-
-    override fun init() {
-        outputs.upToDateWhen {
-            project.checkCommit(
-                property.paperRepository.get(),
-                property.paperBranch.get(),
-                "purpurCommit"
-            )
-        }
-    }
-
-    @TaskAction
-    fun update() {
-        if (project.checkCommit(property.paperRepository.get(), property.paperBranch.get(), "purpurCommit")) return
-        project.createCompareComment(
-            property.paperRepository.get(),
-            property.paperBranch.get(),
-            project.properties["paperCommit"] as String,
-            true
-        )
-        updatePaperCommit(property.paperRepository.get(), property.paperBranch.get(), project.file("gradle.properties"))
-    }
-
-}
-
-fun updatePaperCommit(repo: String, branch: String, properties: File, regexRule: String = "paperCommit = ") {
-    val latestCommit = Git(properties.parentFile.toPath())("ls-remote", repo).readText()?.lines()
-        ?.filterNot { "[a-z0-9]{40}\trefs/heads/$branch".toRegex().matches(it) }?.first()?.split("\t")?.first()
-        ?: throw AlwaysUpToDateException("Failed to get latest Paper commit")
-
-    properties.writeText(properties.readText().replace("$regexRule.*".toRegex(), "$regexRule$latestCommit"))
-}

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

@@ -1,25 +1,31 @@
 package org.plazmamc.alwaysuptodate.tasks
 
+import io.papermc.paperweight.patcher.tasks.CheckoutRepo
 import io.papermc.paperweight.util.Git
 import io.papermc.paperweight.util.cache
 import io.papermc.paperweight.util.path
+import io.papermc.paperweight.util.set
+import org.gradle.api.file.Directory
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.provider.Provider
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
-import org.gradle.kotlin.dsl.get
+import org.gradle.api.tasks.TaskProvider
-import org.plazmamc.alwaysuptodate.AlwaysUpToDateException
+import org.plazmamc.alwaysuptodate.utils.*
-import org.plazmamc.alwaysuptodate.AlwaysUpToDateExtension
+import java.io.File
-import org.plazmamc.alwaysuptodate.utils.Gradle
-import org.plazmamc.alwaysuptodate.utils.addCommit
-import org.plazmamc.alwaysuptodate.utils.clone
 import java.nio.file.Path
-import kotlin.io.path.createDirectories
+import java.util.*
-import kotlin.io.path.exists
+import kotlin.io.path.ExperimentalPathApi
+import kotlin.io.path.name
+import kotlin.io.path.walk
 
+@Deprecated("It will soon be changed to be available for other upstreams.")
 abstract class PurpurUpdateTask : Task() {
 
-    private val property = project.extensions["alwaysUpToDate"] as AlwaysUpToDateExtension
+    private val pufferfishHeader = """
-    private val pufferfishCommit = """
         Pufferfish
-        Copyright (C) 2024 Pufferfish Studios LLC
+        Copyright (C) ${Calendar.getInstance().get(Calendar.YEAR)} Pufferfish Studios LLC
 
         This program is free software: you can redistribute it and/or modify
         it under the terms of the GNU General Public License as published by
@@ -34,9 +40,10 @@ abstract class PurpurUpdateTask : Task() {
         You should have received a copy of the GNU General Public License
         along with this program.  If not, see <http://www.gnu.org/licenses/>.
     """.trimIndent()
-    private val purpurCommit = """
+    private val pufferfishAuthor = "Kevin Raneri <kevin.raneri@gmail.com>"
+    private val purpurHeader = """
         PurpurMC
-        Copyright (C) 2024 PurpurMC
+        Copyright (C) ${Calendar.getInstance().get(Calendar.YEAR)} PurpurMC
         
         Permission is hereby granted, free of charge, to any person obtaining a copy
         of this software and associated documentation files (the "Software"), to deal
@@ -56,124 +63,190 @@ abstract class PurpurUpdateTask : Task() {
         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
         SOFTWARE.
     """.trimIndent()
+    private val purpurAuthor = "granny <contact@granny.dev>"
 
-    override fun init() {
+    @get:Internal
-        outputs.upToDateWhen {
+    abstract val workDir: DirectoryProperty
-            project.checkCommit(
+
-                property.purpurRepository.get(),
+    @get:OutputDirectory
-                property.purpurBranch.get(),
+    abstract val purpurDir: DirectoryProperty
-                "purpurCommit"
+
+    @get:OutputDirectory
+    abstract val pufferfishDir: DirectoryProperty
+
+    override fun init(): Unit = with(project) {
+        val wd = layout.cache.resolve("alwaysUpToDate/update/purpur").also { it.toFile().deleteRecursively() }
+        workDir.set(wd)
+
+        val compare =
+            configureTask<CreateCompareComment>("createPurpurCompareComment", "Create Purpur Compare Comment") {
+                clear.convention(true)
+                repo.convention(extension.purpurRepo)
+                ref.convention(extension.purpurRef)
+                commitPropertyName.convention(extension.purpurCommitName)
+            }
+
+        val paper = dependsOn<SimpleUpstreamUpdateTask>("updatePaper", "Update Paper") {
+            outputs.upToDateWhen { checkCommitFor { repo to ref to paperCommitName } }
+            dependsOn(compare)
+            repo.convention(extension.paperRepo)
+            ref.convention(extension.paperRef)
+            regex.convention("paperCommit = ")
+            workDir.set(layout.projectDirectory)
+        }
+
+        fun checkout(
+            name: String, repo: Provider<String>, ref: Provider<String>, regex: String, block: CheckoutRepo.() -> Unit
+        ): Pair<TaskProvider<CheckoutRepo>, Directory> {
+            val updatePaper = configureTask<SimpleUpstreamUpdateTask>("update${name}Paper", "Update $name's Paper") {
+                this.repo.convention(extension.paperRepo)
+                this.ref.convention(extension.paperRef)
+                this.regex.convention(regex)
+                this.workDir.set(wd.resolve(name))
+            }
+
+            val checkout = dependsOn<CheckoutRepo>("checkout$name", "Checkout $name") {
+                this.dependsOn(paper)
+                this.repoName.convention(name)
+                this.url.convention(repo)
+                this.ref.convention(ref)
+                this.workDir.set(wd)
+
+                this.block()
+                // this.finalizedBy(updatePaper)
+            }
+
+            return checkout to checkout.flatMap { it.outputDir }.get()
+        }
+
+        val (checkoutPufferfish, pufferfish) =
+            checkout("Pufferfish", extension.pufferfishRepo, extension.pufferfishRef, "paperRef=") {
+                onlyIf { extension { usePufferfish } }
+            }
+        val (checkoutPurpur, purpur) =
+            checkout("Purpur", extension.purpurRepo, extension.purpurRef, "paperCommit = ") {}
+
+        pufferfishDir.set(pufferfish)
+        purpurDir.set(purpur)
+
+        val preparePurpur = configureTask("preparePurpur", "Prepare Purpur Sources") {
+            mustRunAfter(paper)
+            dependsOn(checkoutPurpur)
+            doLast { Gradle(purpur.path)("applyPatches").executeOut() }
+        }
+        val preparePufferfish = configureTask("preparePufferfish", "Prepare Pufferfish Sources") {
+            onlyIf { extension { usePufferfish } }
+            mustRunAfter(paper)
+            dependsOn(checkoutPurpur, checkoutPufferfish)
+            doLast {
+                val base = pufferfish.path.resolve("patches").also { it.toFile().deleteRecursively() }
+                val source = purpur.path.resolve("patches")
+                source.resolve("server").copyPatch(base.resolve("server"), "Pufferfish-Server-Changes")
+                source.resolve("api").copyPatch(base.resolve("api"), "Pufferfish-API-Changes")
+                Gradle(pufferfish.path)("applyPatches").executeOut()
+            }
+        }
+
+        dependsOn(preparePurpur, preparePufferfish)
+
+        val serverPatch =
+            configureTask<GenerateMergedServerPatch>("generateMergedServerPatches", "Generate Merged Server Patch") {
+                dependsOn(preparePurpur)
+                if (!extension { usePufferfish }) {
+                    workDir.convention(purpur.dir("Purpur-Server"))
+                    commitTitle.convention("Purpur Server Changes")
+                    license.convention(purpurHeader)
+                    author.convention(purpurAuthor)
+                    return@configureTask
+                }
+
+                dependsOn(preparePufferfish)
+                workDir.convention(pufferfish.dir("pufferfish-server"))
+                commitTitle.convention("Pufferfish Server Changes")
+                license.convention(pufferfishHeader)
+                author.convention(pufferfishAuthor)
+
+                doLast {
+                    val dotGit = pufferfish.dir("pufferfish-server/.git").path.toFile()
+
+                    purpur.path.resolve("Purpur-Server").let {
+                        val purpurDotGit = it.resolve(".git").toFile().also(File::deleteRecursively)
+
+                        copySource(it)
+                        dotGit.copyRecursively(purpurDotGit, overwrite = true)
+                        Git(it).addCommit("Purpur Server Changes\n\n$purpurHeader", "--author=$purpurAuthor")
+                    }
+                }
+            }
+
+        val pufferfishAPIChanges = configureTask<GenerateMergedAPIPatch>(
+            "generateMergedPufferfishAPIPatch",
+            "Generate Merged Pufferfish API Patch"
+        ) {
+            dependsOn(preparePufferfish)
+            inputDir.convention(pufferfish.dir(".gradle/caches/paperweight/upstreams/paper/Paper-API/.git"))
+            workDir.convention(pufferfish.dir("pufferfish-api"))
+            commitTitle.convention("Pufferfish API Changes")
+            license.convention(pufferfishHeader)
+            author.convention(pufferfishAuthor)
+        }
+
+        val apiPatch = configureTask<GenerateMergedAPIPatch>(
+            "generateMergedAPIPatches",
+            "Generate Merged API Patches"
+        ) {
+            dependsOn(preparePurpur)
+            if (extension { usePufferfish }) dependsOn(pufferfishAPIChanges)
+
+            workDir.convention(purpur.dir("Purpur-API"))
+            commitTitle.convention("Purpur API Changes")
+            license.convention(purpurHeader)
+            author.convention(purpurAuthor)
+            inputDir.convention(
+                if (extension { usePufferfish }) pufferfish.dir("pufferfish-api/.git")
+                else purpur.dir(".gradle/caches/paperweight/upstreams/paper/Paper-API/.git")
             )
         }
+
+        dependsOn("buildPatches", "Build Merged Patches") {
+            dependsOn(serverPatch, apiPatch)
+            doLast { Gradle(purpur.path)("rebuildPatches").executeOut() }
+        }
     }
 
     @TaskAction
-    fun update() {
+    fun update() = with(project) {
-        if (project.checkCommit(property.purpurRepository.get(), property.purpurBranch.get(), "purpurCommit")) return
+        val purpur = purpurDir.path
-        Git.checkForGit()
+        val pufferfish = if (extension { usePufferfish }) pufferfishDir.path else null
 
-        project.createCompareComment(
+        val patches = purpur.resolve("patches")
-            property.purpurRepository.get(),
+        with(layout.projectDirectory.path.resolve("patches")) {
-            property.purpurBranch.get(),
+            patches.resolve("server").copyPatch( resolve("server"),
-            project.properties["purpurCommit"] as String,
+                if (pufferfish == null) "" else "Pufferfish-Server-Changes",
-            true
+                "Purpur-Server-Changes"
-        )
-        val dir = project.layout.cache.resolve("AlwaysUpToDate/UpdatePurpur")
-        if (dir.exists()) dir.toFile().deleteRecursively()
-
-        dir.createDirectories()
-
-        val git = Git(dir)
-        val pufferfish = git.clone("Pufferfish", property.pufferfishRepository.get(), property.pufferfishBranch.get(), dir)
-        val purpur = git.clone("Purpur", property.purpurRepository.get(), property.purpurBranch.get(), dir)
-
-        updatePaperCommit(property.paperRepository.get(), property.paperBranch.get(), pufferfish.resolve("gradle.properties").toFile(), "paperRef=")
-        updatePaperCommit(property.paperRepository.get(), property.paperBranch.get(), purpur.resolve("gradle.properties").toFile())
-
-        if (!project.checkCommit(property.paperRepository.get(), property.paperBranch.get(), "paperCommit")) {
-            project.createCompareComment(
-                property.paperRepository.get(),
-                property.paperBranch.get(),
-                project.properties["paperCommit"] as String
             )
-            updatePaperCommit(
+
-                property.paperRepository.get(),
+            patches.resolve("api").copyPatch( resolve("api"),
-                property.paperBranch.get(),
+                if (pufferfish == null) "" else "Pufferfish-API-Changes",
-                project.file("gradle.properties")
+                "Purpur-API-Changes"
             )
         }
 
-        val latestCommit = git("ls-remote", property.purpurRepository.get()).readText()?.lines()
+        file("gradle.properties").let {
-            ?.filterNot { "[a-z0-9]{40}\trefs/heads/${property.purpurBranch.get()}".toRegex().matches(it) }?.first()?.split("\t")?.first()
+            it.writeText(
-            ?: throw AlwaysUpToDateException("Failed to get latest Purpur commit")
+                it.readText().replace("purpurCommit = .*".toRegex(), "purpurCommit = ${Git(purpur).revParse()}")
-
+            )
-        val purpurGradle = Gradle(purpur)
-        val purpurPatches = purpur.resolve("patches").also {
-            val puffefishPatches = pufferfish.resolve("patches").also { that -> that.toFile().deleteRecursively() }
-            copyPatch(it.resolve("server"), puffefishPatches.resolve("server"), "0001-Pufferfish-Server-Changes.patch")
-            copyPatch(it.resolve("api"), puffefishPatches.resolve("api"), "0001-Pufferfish-API-Changes.patch")
-        }
-
-        Gradle(pufferfish)("applyPatches").executeOut()
-        purpurGradle("applyPatches").executeOut()
-
-        pufferfish.resolve("pufferfish-server").also {
-            val dotGit = it.resolve(".git").toFile()
-            dotGit.deleteRecursively()
-            copySource(it)
-
-            val paper = pufferfish.resolve(".gradle/caches/paperweight/upstreams/paper/Paper-Server")
-            copySource(paper)
-            Git(paper)("add", ".").executeOut()
-            Git(paper)("commit", "-m", "Vanilla Sources", "--author=Vanilla <auto@mated.null>").executeOut()
-            Thread.sleep(1_000)
-            paper.resolve(".git").toFile().copyRecursively(dotGit, overwrite = true)
-
-            Git(it).addCommit("Pufferfish Server Changes\n\n$pufferfishCommit", "--author=Kevin Raneri <kevin.raneri@gmail.com>")
-
-            val server = purpur.resolve("Purpur-Server")
-            copySource(server)
-            dotGit.copyRecursively(server.resolve(".git").toFile().also { that -> that.deleteRecursively() }, overwrite = true)
-            Git(server).addCommit("Purpur Server Changes\n\n$purpurCommit", "--author=granny <contact@granny.dev>")
-        }
-
-        with(purpur.resolve("Purpur-API")) {
-            pufferfish.resolve("pufferfish-api/.git").toFile()
-                .copyRecursively(resolve(".git").toFile().also { it.deleteRecursively() }, overwrite = true)
-            Git(this).addCommit("Purpur API Changes\n\n$purpurCommit", "--author=granny <contact@granny.dev>")
-        }
-
-        purpurGradle("rebuildPatches").executeOut()
-        project.layout.projectDirectory.path.resolve("patches").also {
-            with(purpurPatches.resolve("server")) {
-                val target = it.resolve("server")
-                copyPatch(this, target, "0001-Pufferfish-Server-Changes.patch")
-                copyPatch(this, target, "0002-Purpur-Server-Changes.patch")
-            }
-
-            with(purpurPatches.resolve("api")) {
-                val target = it.resolve("api")
-                copyPatch(this, target, "0001-Pufferfish-API-Changes.patch")
-                copyPatch(this, target, "0002-Purpur-API-Changes.patch")
-            }
-        }
-
-        project.file("gradle.properties").writeText(project.file("gradle.properties").readText().replace("purpurCommit = .*".toRegex(), "purpurCommit = $latestCommit"))
-    }
-
-    private fun copySource(dir: Path) {
-        with(dir.resolve(".gradle/caches/paperweight/mc-dev-sources")) {
-            val target = dir.resolve("src/main")
-            resolve("net").toFile().copyRecursively(target.resolve("java/net").toFile(), overwrite = true)
-            resolve("data").toFile().copyRecursively(target.resolve("resources/data").toFile(), overwrite = true)
-        }
-    }
-
-    private fun copyPatch(from: Path, to: Path, name: String) {
-        with(from.resolve(name)) {
-            if (exists()) toFile().copyTo(to.resolve(name).toFile(), overwrite = true)
-            else from.toFile().walk().filter { it.name.endsWith(name.substring(4)) }.first().copyTo(to.resolve(name).toFile(), overwrite = true)
         }
     }
 
 }
+
+@OptIn(ExperimentalPathApi::class)
+private fun Path.copyPatch(to: Path, vararg name: String) = walk().sorted()
+    .filter { entry -> name.filter { it != "" }.any { entry.name.endsWith("$it.patch") } }.map(Path::toFile)
+    .forEachIndexed { count, patch ->
+        patch.copyTo(
+            to.resolve("${count + 1}".padStart(4, '0') + "-" + name.first { patch.name.substring(5) == "$it.patch" } + ".patch").toFile(),
+            overwrite = true
+        )
+    }

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

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

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

@@ -4,8 +4,7 @@ import org.gradle.api.DefaultTask
 
 abstract class Task : DefaultTask() {
 
-    protected open fun init() {
+    protected open fun init() {}
-    }
 
     init {
         this.init()

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

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

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

@@ -14,8 +14,17 @@ class Gradle(private val repo: Path) {
     }
 
     operator fun invoke(vararg args: String): Command {
-        val builder = ProcessBuilder("java", "-cp", "gradle/wrapper/gradle-wrapper.jar", "org.gradle.wrapper.GradleWrapperMain", *args, "--no-daemon", "--stacktrace").directory(repo)
+        val builder = ProcessBuilder(
-        val command = builder.command().joinToString(" ") {  if (it.codePoints().anyMatch(Character::isWhitespace)) "\"$it\"" else it }
+            "java",
+            "-cp",
+            "gradle/wrapper/gradle-wrapper.jar",
+            "org.gradle.wrapper.GradleWrapperMain",
+            *args,
+            "--no-daemon",
+            "--stacktrace"
+        ).directory(repo)
+        val command = builder.command()
+            .joinToString(" ") { if (it.codePoints().anyMatch(Character::isWhitespace)) "\"$it\"" else it }
 
         return try {
             Command(builder, command)

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

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

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

@@ -1,7 +1,3 @@
 package org.plazmamc.alwaysuptodate.utils
 
-import io.papermc.paperweight.util.path
+fun <A, B, C> Pair<Pair<A, B>, C>.flatten() = Triple(first.first, first.second, second)
-import org.gradle.api.Project
-import java.nio.file.Path
-
-val Project.pathIO: Path get() = layout.projectDirectory.path

fxapi

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# FixupAPI
-
-PS1="$"
-
-cd Plazma-API
-
-git add .
-git commit -m "fixup"
-git format-patch -1
-
-cd ../

fxsrv

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# FixupServer
-
-PS1="$"
-
-cd Plazma-Server
-
-git add .
-git commit -m "fixup"
-git format-patch -1
-
-cd ../

gradle.properties

@@ -1,11 +1,29 @@
-version = 1.20.4-R0.1-SNAPSHOT
+org.gradle.daemon = true
-mcVersion = 1.20.4
-
-paperCommit = 850b736e1442587230bbba241f99eb0cee193cd9
-purpurCommit = d80fbedf5d8a8830aa895595114ec1979fc0a3f7
-
-group = org.plazmamc.plazma
 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
+
+paper.runMemoryGb = 8
+paper.runDisableWatchdog = true
+
+group = org.plazmamc.plazma
+brandKey = plazmamc:plazma
+brandName = Plazma
+providerName = PlazmaMC
+providerRepo = PlazmaMC/PlazmaBukkit
+
+version = 1.21.3-R0.1-SNAPSHOT
+mcVersion = 1.21.3
+jdkVersion = 21
+
+paperRepo = https://github.com/PaperMC/Paper-archive
+paperBranch = ver/1.21.3
+purpurRepo = https://github.com/PurpurMC/Purpur
+purpurBranch = ver/1.21.3
+pufferfishRepo = https://github.com/pufferfish-gg/Pufferfish
+pufferfishBranch = ver/1.21
+usePufferfish = false
+
+paperCommit = da7138233f6392e791d790d1c3407414c855f9c2
+purpurCommit = 16ce24aa7eb08232030e4570e027f7baefa5f3f9

gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
-shadow = "8.1.1"
+shadow = "8.3.5"
-paperweight = "1.5.11"
+remapper = "0.10.3"
 paperclip = "3.0.3"
-decompiler = "2.0.627.2"
+paperweight = "1.7.4"
-remapper = "0.10.0"
+decompiler = "1.10.1"
 
 [libraries]
-remapper = { group = "net.fabricmc", name = "tiny-remapper", version.ref="remapper" }
-decompiler = { group = "net.minecraftforge", name = "forgeflower", version.ref = "decompiler" }
 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.github.johnrengelman.shadow", version.ref = "shadow" }
+shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
 paperweight = { id = "io.papermc.paperweight.patcher", version.ref = "paperweight" }

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

gradlew.bat

@@ -1,92 +1,92 @@
-@rem
+@rem
-@rem Copyright 2015 the original author or authors.
+@rem Copyright 2015 the original author or authors.
-@rem
+@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
+@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
+@rem You may obtain a copy of the License at
-@rem
+@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
+@rem
-@rem Unless required by applicable law or agreed to in writing, software
+@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
+@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
+@rem limitations under the License.
-@rem
+@rem
-
+
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
+@rem ##########################################################################
-@rem
+@rem
-@rem  Gradle startup script for Windows
+@rem  Gradle startup script for Windows
-@rem
+@rem
-@rem ##########################################################################
+@rem ##########################################################################
-
+
-@rem Set local scope for the variables with windows NT shell
+@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+if "%OS%"=="Windows_NT" setlocal
-
+
-set DIRNAME=%~dp0
+set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+@rem This is normally unused
-set APP_BASE_NAME=%~n0
+set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
+set APP_HOME=%DIRNAME%
-
+
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
+
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
+
-@rem Find java.exe
+@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
+if defined JAVA_HOME goto findJavaFromJavaHome
-
+
-set JAVA_EXE=java.exe
+set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
+%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if %ERRORLEVEL% equ 0 goto execute
-
+
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
-
+
-goto fail
+goto fail
-
+
-:findJavaFromJavaHome
+:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
+
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto execute
-
+
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
-
+
-goto fail
+goto fail
-
+
-:execute
+:execute
-@rem Setup the command line
+@rem Setup the command line
-
+
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
+
-
+
-@rem Execute Gradle
+@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
+
-:end
+:end
-@rem End local scope for the variables with windows NT shell
+@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
-
+
-:fail
+:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
+rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
+set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+exit /b %EXIT_CODE%
-
+
-:mainEnd
+:mainEnd
-if "%OS%"=="Windows_NT" endlocal
+if "%OS%"=="Windows_NT" endlocal
-
+
-:omega
+:omega

initDev

@@ -0,0 +1,136 @@
+#!/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,29 +1,47 @@
 [versions]
-gson = "2.10.1"
+brigadier = "1.2.9"
-joml = "1.10.5"
+
-guava = "32.1.2-jre"
+guava = "33.3.1-jre"
-sentry = "5.4.0"
+gson = "2.11.0"
-fastutil = "8.5.6"
+bungeechat = "1.20-R0.2-deprecated+build.19"
-findbugs = "1.3.9"
+
-slf4j-api = "2.0.9"
+# snakeyaml
-bungeechat = "1.20-R0.2"
+joml = "1.10.8"
 json-simple = "1.1.1"
-annotations = "24.0.1"
+
+fastutil = "8.5.6"
+# 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]
-joml = { group = "org.joml", name = "joml", version.ref = "joml" }
+brigadier = { group = "com.mojang", name = "brigadier", version.ref = "brigadier" }
-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
+
 guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
-sentry = { group = "io.sentry", name = "sentry", version.ref = "sentry" }
+gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
-fastutil = { group = "it.unimi.dsi", name = "fastutil", version.ref = "fastutil" }
-findbugs = { group = "com.google.code.findbugs", name = "jsr305", version.ref = "findbugs" }
-slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j-api" }
 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 = [ "guava", "gson", "bungeechat", "joml", "fastutil", "slf4j-api", "sentry" ]
+api = [ "brigadier", "guava", "gson", "joml", "fastutil", "slf4j", "sentry", "jspecify" ]
 annotations = [ "annotations", "checkerqual" ]

libs/common.versions.toml

@@ -1,45 +1,73 @@
 [versions]
-asm = "9.6"
+adventure = "4.17.0"
 log4j = "2.19.0"
-mockito = "5.5.0"
+asm = "9.7.1"
-jupiter = "5.10.0"
+
-hamcrest = "2.2"
+mvn = "3.9.6"
-snakeyaml = "2.2"
+mvn-resolver = "1.9.18"
-adventure = "4.15.0"
+
 commons-lang2 = "2.6"
 commons-lang3 = "3.12.0"
-maven-provider = "3.9.6"
+
-maven-resolver = "1.9.18"
+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]
-mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "jupiter" }
-hamcrest = { group = "org.hamcrest", name = "hamcrest", version.ref = "hamcrest" }
-snakeyaml = { group = "org.yaml", name = "snakeyaml", version.ref = "snakeyaml" }
-
-asm-head = { group = "org.ow2.asm", name = "asm", version.ref = "asm" }
-asm-tree = { group = "org.ow2.asm", name = "asm-tree", version.ref = "asm" }
-asm-commons = { group = "org.ow2.asm", name = "asm-commons", version.ref = "asm" }
-log4j-api = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" }
-log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" }
-log4j-iostreams = { group = "org.apache.logging.log4j", name = "log4j-iostreams", version.ref = "log4j" }
-maven-provider = { group = "org.apache.maven", name = "maven-resolver-provider", version.ref = "maven-provider" }
-maven-connector = { group = "org.apache.maven.resolver", name = "maven-resolver-connector-basic", version.ref = "maven-resolver" }
-maven-transport = { group = "org.apache.maven.resolver", name = "maven-resolver-transport-http", version.ref = "maven-resolver" }
-commons-lang2 = { group = "commons-lang", name = "commons-lang", version.ref = "commons-lang2" }
-commons-lang3 = { group = "org.apache.commons", name = "commons-lang3", version.ref = "commons-lang3" }
-
 adventure-bom = { group = "net.kyori", name = "adventure-bom", version.ref = "adventure" }
 adventure-api = { group = "net.kyori", name = "adventure-api", version.ref = "adventure" }
-adventure-slf4j = { group = "net.kyori", name = "adventure-text-logger-slf4j", version.ref = "adventure" }
 adventure-minimessage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "adventure" }
+adventure-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-head", "asm-commons" ]
+asm = [ "asm", "asm-commons" ]
-test = [ "jupiter", "hamcrest", "mockito", "asm-tree" ]
+mvn = [ "mvn-connector", "mvn-transport" ]
-maven = [ "maven-connector", "maven-transport" ]
+
-adventure = [ "adventure-api", "adventure-slf4j", "adventure-minimessage", "adventure-serializer-gson", "adventure-serializer-plain", "adventure-serializer-legacy" ]
+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,38 +1,89 @@
 [versions]
-ansi = "1.0.3"
+jline = "3.27.1"
-jansi = "3.21.0"
+tca = "1.3.0"
-rhino = "1.7.14"
+# adventure
-mysql = "8.2.0"
+# log4j
-sqlite = "3.42.0.1"
+netty = "4.1.97.Final"
-pioneer = "2.2.0"
+# asm
-haproxy = "4.1.97.Final"
-velocity = "3.1.2-SNAPSHOT"
-disruptor = "3.4.4"
-simpleyaml = "1.8.4"
-classgraph = "4.8.47"
-mapping-io = "0.5.0"
 configurate = "4.2.0-SNAPSHOT"
-terminal-appender = "1.3.0"
+# commons2
+sqlite = "3.46.1.3"
+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]
-ansi = { group = "net.kyori", name = "ansi", version.ref = "ansi" }
+jline-ffm = { group = "org.jline", name = "jline-terminal-ffm", version.ref = "jline" }
-mysql = { group = "com.mysql", name = "mysql-connector-j", version.ref = "mysql" }
+jline-jni = { group = "org.jline", name = "jline-terminal-jni", version.ref = "jline" }
-jansi = { group = "org.jline", name = "jline-terminal-jansi", version.ref = "jansi" }
+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" }
-pioneer = { group = "org.junit-pioneer", name = "junit-pioneer", version.ref = "pioneer" }
+mysql = { group = "com.mysql", name = "mysql-connector-j", version.ref = "mysql" }
-haproxy = { group = "io.netty", name = "netty-codec-haproxy", version.ref = "haproxy" }
-velocity = { group = "com.velocitypowered", name = "velocity-native", version.ref = "velocity" }
 disruptor = { group = "com.lmax", name = "disruptor", version.ref = "disruptor" }
-mappingio = { group = "net.fabricmc", name = "mapping-io", version.ref = "mapping-io" }
+velocity-native = { group = "com.velocitypowered", name = "velocity-native", version.ref = "velocity" }
-classgraph = { group = "io.github.classgraph", name = "classgraph", version.ref = "classgraph" }
+
-simpleyaml = { group = "com.github.carleslc.Simple-YAML", name = "Simple-Yaml", version.ref = "simpleyaml" }
+# snakeyaml
-configurate = { group = "org.spongepowered", name = "configurate-yaml", version.ref = "configurate" }
+simpleyaml = { group = "com.github.carleslc.Simple-YAML", name = "Simple-Yaml", version.ref = "simpleyaml" }
 
-rhino-engine = { group = "org.mozilla", name = "rhino-engine", version.ref = "rhino" }
 rhino-runtime = { group = "org.mozilla", name = "rhino-runtime", version.ref = "rhino" }
-terminal-appender = { group = "net.minecrell", name = "terminalconsoleappender", version.ref="terminal-appender" }
+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" ]
-implementation = [ "jansi", "terminal-appender", "ansi", "haproxy", "configurate", "mappingio", "rhino-engine", "rhino-runtime" ]
+test = [ "classgraph" ]
-test = [ "classgraph", "pioneer" ]
+
+implementation = [
+    "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"
+]

mkapi

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# PatchAPI <Patch Name>
-
-PS1="$"
-
-cd Plazma-API
-
-git add .
-git commit -m $1
-
-cd ../
-
-./gradlew rebuildAPIPatches

mksrv

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# PatchServer <Patch Name>
-
-PS1="$"
-
-cd Plazma-Server
-
-git add .
-git commit -m $1
-
-cd ../
-
-./gradlew rebuildServerPatches

patches/api/0001-Pufferfish-API-Changes.patch

@@ -1,527 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kevin Raneri <kevin.raneri@gmail.com>
-Date: Tue, 9 Nov 2021 14:01:56 -0500
-Subject: [PATCH] Pufferfish API Changes
-
-Pufferfish
-Copyright (C) 2022 Pufferfish Studios LLC
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index bf01892c248b988531d21d9fb0f74d0adf2205ac..80833c13a2d19e31d6f648e7ef5b3456025e767e 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -51,6 +51,7 @@ dependencies {
-     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.5")
-     implementation("org.ow2.asm:asm-commons:9.5")
-@@ -109,6 +110,13 @@ val generateApiVersioningFile by tasks.registering {
-     }
- }
- 
-+// Pufferfish Start
-+tasks.withType<JavaCompile> {
-+    val compilerArgs = options.compilerArgs
-+    compilerArgs.add("--add-modules=jdk.incubator.vector")
-+}
-+// Pufferfish End
-+
- tasks.jar {
-     from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
-         into("META-INF/maven/${project.group}/${project.name}")
-diff --git a/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java b/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..10310fdd53de28efb8a8250f6d3b0c8eb08fb68a
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java
-@@ -0,0 +1,161 @@
-+package gg.pufferfish.pufferfish.sentry;
-+
-+import com.google.gson.Gson;
-+import java.lang.reflect.Field;
-+import java.lang.reflect.Modifier;
-+import java.util.Map;
-+import java.util.TreeMap;
-+import org.apache.logging.log4j.ThreadContext;
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.entity.Player;
-+import org.bukkit.event.Event;
-+import org.bukkit.event.player.PlayerEvent;
-+import org.bukkit.plugin.Plugin;
-+import org.bukkit.plugin.RegisteredListener;
-+import org.jetbrains.annotations.Nullable;
-+
-+public class SentryContext {
-+	
-+	private static final Gson GSON = new Gson();
-+	
-+	public static void setPluginContext(@Nullable Plugin plugin) {
-+		if (plugin != null) {
-+			ThreadContext.put("pufferfishsentry_pluginname", plugin.getName());
-+			ThreadContext.put("pufferfishsentry_pluginversion", plugin.getDescription().getVersion());
-+		}
-+	}
-+	
-+	public static void removePluginContext() {
-+		ThreadContext.remove("pufferfishsentry_pluginname");
-+		ThreadContext.remove("pufferfishsentry_pluginversion");
-+	}
-+	
-+	public static void setSenderContext(@Nullable CommandSender sender) {
-+		if (sender != null) {
-+			ThreadContext.put("pufferfishsentry_playername", sender.getName());
-+			if (sender instanceof Player player) {
-+				ThreadContext.put("pufferfishsentry_playerid", player.getUniqueId().toString());
-+			}
-+		}
-+	}
-+	
-+	public static void removeSenderContext() {
-+		ThreadContext.remove("pufferfishsentry_playername");
-+		ThreadContext.remove("pufferfishsentry_playerid");
-+	}
-+	
-+	public static void setEventContext(Event event, RegisteredListener registration) {
-+		setPluginContext(registration.getPlugin());
-+		
-+		try {
-+			// Find the player that was involved with this event
-+			Player player = null;
-+			if (event instanceof PlayerEvent) {
-+				player = ((PlayerEvent) event).getPlayer();
-+			} else {
-+				Class<? extends Event> eventClass = event.getClass();
-+				
-+				Field playerField = null;
-+				
-+				for (Field field : eventClass.getDeclaredFields()) {
-+					if (field.getType().equals(Player.class)) {
-+						playerField = field;
-+						break;
-+					}
-+				}
-+				
-+				if (playerField != null) {
-+					playerField.setAccessible(true);
-+					player = (Player) playerField.get(event);
-+				}
-+			}
-+			
-+			if (player != null) {
-+				setSenderContext(player);
-+			}
-+		} catch (Exception e) {} // We can't really safely log exceptions.
-+		
-+		ThreadContext.put("pufferfishsentry_eventdata", GSON.toJson(serializeFields(event)));
-+	}
-+	
-+	public static void removeEventContext() {
-+		removePluginContext();
-+		removeSenderContext();
-+		ThreadContext.remove("pufferfishsentry_eventdata");
-+	}
-+	
-+	private static Map<String, String> serializeFields(Object object) {
-+		Map<String, String> fields = new TreeMap<>();
-+		fields.put("_class", object.getClass().getName());
-+		for (Field declaredField : object.getClass().getDeclaredFields()) {
-+			try {
-+				if (Modifier.isStatic(declaredField.getModifiers())) {
-+					continue;
-+				}
-+				
-+				String fieldName = declaredField.getName();
-+				if (fieldName.equals("handlers")) {
-+					continue;
-+				}
-+				declaredField.setAccessible(true);
-+				Object value = declaredField.get(object);
-+				if (value != null) {
-+					fields.put(fieldName, value.toString());
-+				} else {
-+					fields.put(fieldName, "<null>");
-+				}
-+			} catch (Exception e) {} // We can't really safely log exceptions.
-+		}
-+		return fields;
-+	}
-+	
-+	public static class State {
-+		
-+		private Plugin plugin;
-+		private Command command;
-+		private String commandLine;
-+		private Event event;
-+		private RegisteredListener registeredListener;
-+		
-+		public Plugin getPlugin() {
-+			return plugin;
-+		}
-+		
-+		public void setPlugin(Plugin plugin) {
-+			this.plugin = plugin;
-+		}
-+		
-+		public Command getCommand() {
-+			return command;
-+		}
-+		
-+		public void setCommand(Command command) {
-+			this.command = command;
-+		}
-+		
-+		public String getCommandLine() {
-+			return commandLine;
-+		}
-+		
-+		public void setCommandLine(String commandLine) {
-+			this.commandLine = commandLine;
-+		}
-+		
-+		public Event getEvent() {
-+			return event;
-+		}
-+		
-+		public void setEvent(Event event) {
-+			this.event = event;
-+		}
-+		
-+		public RegisteredListener getRegisteredListener() {
-+			return registeredListener;
-+		}
-+		
-+		public void setRegisteredListener(RegisteredListener registeredListener) {
-+			this.registeredListener = registeredListener;
-+		}
-+	}
-+}
-diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..ab5fea0b03224bf249352ce340e94704ff713345
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
-@@ -0,0 +1,40 @@
-+package gg.pufferfish.pufferfish.simd;
-+
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+import jdk.incubator.vector.FloatVector;
-+import jdk.incubator.vector.IntVector;
-+import jdk.incubator.vector.VectorSpecies;
-+
-+/**
-+ * Basically, java is annoying and we have to push this out to its own class.
-+ */
-+@Deprecated
-+public class SIMDChecker {
-+	
-+	@Deprecated
-+	public static boolean canEnable(Logger logger) {
-+		try {
-+			if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19) {
-+				return false;
-+			} else {
-+				SIMDDetection.testRun = true;
-+				
-+				VectorSpecies<Integer> ISPEC = IntVector.SPECIES_PREFERRED;
-+				VectorSpecies<Float> FSPEC = FloatVector.SPECIES_PREFERRED;
-+				
-+				logger.log(Level.INFO, "Max SIMD vector size on this system is " + ISPEC.vectorBitSize() + " bits (int)");
-+				logger.log(Level.INFO, "Max SIMD vector size on this system is " + FSPEC.vectorBitSize() + " bits (float)");
-+				
-+				if (ISPEC.elementSize() < 2 || FSPEC.elementSize() < 2) {
-+					logger.log(Level.WARNING, "SIMD is not properly supported on this system!");
-+					return false;
-+				}
-+
-+				return true;
-+			}
-+		} catch (NoClassDefFoundError | Exception ignored) {} // Basically, we don't do anything. This lets us detect if it's not functional and disable it.
-+		return false;
-+	}
-+	
-+}
-diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..a84889d3e9cfc4d7ab5f867820a6484c6070711b
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java
-@@ -0,0 +1,35 @@
-+package gg.pufferfish.pufferfish.simd;
-+
-+import java.util.logging.Logger;
-+
-+@Deprecated
-+public class SIMDDetection {
-+	
-+	public static boolean isEnabled = false;
-+	public static boolean versionLimited = false;
-+	public static boolean testRun = false;
-+	
-+	@Deprecated
-+	public static boolean canEnable(Logger logger) {
-+		try {
-+			return SIMDChecker.canEnable(logger);
-+		} catch (NoClassDefFoundError | Exception ignored) {
-+			return false;
-+		}
-+	}
-+	
-+	@Deprecated
-+	public static int getJavaVersion() {
-+		// https://stackoverflow.com/a/2591122
-+		String version = System.getProperty("java.version");
-+		if(version.startsWith("1.")) {
-+			version = version.substring(2, 3);
-+		} else {
-+			int dot = version.indexOf(".");
-+			if(dot != -1) { version = version.substring(0, dot); }
-+		}
-+		version = version.split("-")[0]; // Azul is stupid
-+		return Integer.parseInt(version);
-+	}
-+	
-+}
-diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java b/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..ae2464920c9412ac90b819a540ee58be0741465f
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java
-@@ -0,0 +1,83 @@
-+package gg.pufferfish.pufferfish.simd;
-+
-+import java.awt.Color;
-+import jdk.incubator.vector.FloatVector;
-+import jdk.incubator.vector.IntVector;
-+import jdk.incubator.vector.VectorMask;
-+import jdk.incubator.vector.VectorSpecies;
-+import org.bukkit.map.MapPalette;
-+
-+@Deprecated
-+public class VectorMapPalette {
-+	
-+	private static final VectorSpecies<Integer> I_SPEC = IntVector.SPECIES_PREFERRED;
-+	private static final VectorSpecies<Float> F_SPEC = FloatVector.SPECIES_PREFERRED;
-+	
-+	@Deprecated
-+	public static void matchColorVectorized(int[] in, byte[] out) {
-+		int speciesLength = I_SPEC.length();
-+		int i;
-+		for (i = 0; i < in.length - speciesLength; i += speciesLength) {
-+			float[] redsArr = new float[speciesLength];
-+			float[] bluesArr = new float[speciesLength];
-+			float[] greensArr = new float[speciesLength];
-+			int[] alphasArr = new int[speciesLength];
-+			
-+			for (int j = 0; j < speciesLength; j++) {
-+				alphasArr[j] = (in[i + j] >> 24) & 0xFF;
-+				redsArr[j] = (in[i + j] >> 16) & 0xFF;
-+				greensArr[j] = (in[i + j] >> 8) & 0xFF;
-+				bluesArr[j] = (in[i + j] >> 0) & 0xFF;
-+			}
-+			
-+			IntVector alphas = IntVector.fromArray(I_SPEC, alphasArr, 0);
-+			FloatVector reds = FloatVector.fromArray(F_SPEC, redsArr, 0);
-+			FloatVector greens = FloatVector.fromArray(F_SPEC, greensArr, 0);
-+			FloatVector blues = FloatVector.fromArray(F_SPEC, bluesArr, 0);
-+			IntVector resultIndex = IntVector.zero(I_SPEC);
-+			VectorMask<Integer> modificationMask = VectorMask.fromLong(I_SPEC, 0xffffffff);
-+			
-+			modificationMask = modificationMask.and(alphas.lt(128).not());
-+			FloatVector bestDistances = FloatVector.broadcast(F_SPEC, Float.MAX_VALUE);
-+			
-+			for (int c = 4; c < MapPalette.colors.length; c++) {
-+				// We're using 32-bit floats here because it's 2x faster and nobody will know the difference.
-+				// For correctness, the original algorithm uses 64-bit floats instead. Completely unnecessary.
-+				FloatVector compReds = FloatVector.broadcast(F_SPEC, MapPalette.colors[c].getRed());
-+				FloatVector compGreens = FloatVector.broadcast(F_SPEC, MapPalette.colors[c].getGreen());
-+				FloatVector compBlues = FloatVector.broadcast(F_SPEC, MapPalette.colors[c].getBlue());
-+				
-+				FloatVector rMean = reds.add(compReds).div(2.0f);
-+				FloatVector rDiff = reds.sub(compReds);
-+				FloatVector gDiff = greens.sub(compGreens);
-+				FloatVector bDiff = blues.sub(compBlues);
-+				
-+				FloatVector weightR = rMean.div(256.0f).add(2);
-+				FloatVector weightG = FloatVector.broadcast(F_SPEC, 4.0f);
-+				FloatVector weightB = FloatVector.broadcast(F_SPEC, 255.0f).sub(rMean).div(256.0f).add(2.0f);
-+				
-+				FloatVector distance = weightR.mul(rDiff).mul(rDiff).add(weightG.mul(gDiff).mul(gDiff)).add(weightB.mul(bDiff).mul(bDiff));
-+				
-+				// Now we compare to the best distance we've found.
-+				// This mask contains a "1" if better, and a "0" otherwise.
-+				VectorMask<Float> bestDistanceMask = distance.lt(bestDistances);
-+				bestDistances = bestDistances.blend(distance, bestDistanceMask); // Update the best distances
-+				
-+				// Update the result array
-+				// We also AND with the modification mask because we don't want to interfere if the alpha value isn't large enough.
-+				resultIndex = resultIndex.blend(c, bestDistanceMask.cast(I_SPEC).and(modificationMask)); // Update the results
-+			}
-+			
-+			for (int j = 0; j < speciesLength; j++) {
-+				int index = resultIndex.lane(j);
-+				out[i + j] = (byte) (index < 128 ? index : -129 + (index - 127));
-+			}
-+		}
-+		
-+		// For the final ones, fall back to the regular method
-+		for (; i < in.length; i++) {
-+			out[i] = MapPalette.matchColor(new Color(in[i], true));
-+		}
-+	}
-+	
-+}
-diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java
-index c80faa079eca1564847070f0338fc98024639829..e632d51d3487eb4807243b6705999ad124466bf5 100644
---- a/src/main/java/org/bukkit/map/MapPalette.java
-+++ b/src/main/java/org/bukkit/map/MapPalette.java
-@@ -1,6 +1,7 @@
- package org.bukkit.map;
- 
- import com.google.common.base.Preconditions;
-+import gg.pufferfish.pufferfish.simd.SIMDDetection; // Pufferfish
- import java.awt.Color;
- import java.awt.Graphics2D;
- import java.awt.Image;
-@@ -40,7 +41,7 @@ public final class MapPalette {
-     }
- 
-     @NotNull
--    static final Color[] colors = {
-+    public static final Color[] colors = { // Pufferfish - public access
-         c(0, 0, 0, 0), c(0, 0, 0, 0), c(0, 0, 0, 0), c(0, 0, 0, 0),
-         c(89, 125, 39), c(109, 153, 48), c(127, 178, 56), c(67, 94, 29),
-         c(174, 164, 115), c(213, 201, 140), c(247, 233, 163), c(130, 123, 86),
-@@ -211,9 +212,15 @@ public final class MapPalette {
-         temp.getRGB(0, 0, temp.getWidth(), temp.getHeight(), pixels, 0, temp.getWidth());
- 
-         byte[] result = new byte[temp.getWidth() * temp.getHeight()];
-+        // Pufferfish start
-+        if (!SIMDDetection.isEnabled) {
-         for (int i = 0; i < pixels.length; i++) {
-             result[i] = matchColor(new Color(pixels[i], true));
-         }
-+        } else {
-+            gg.pufferfish.pufferfish.simd.VectorMapPalette.matchColorVectorized(pixels, result);
-+        }
-+        // Pufferfish end
-         return result;
-     }
- 
-diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index fc2dae69165776d08274e34a69962cc70445f411..899d67fa782fac639fe7fb096e05c551d75bd647 100644
---- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -584,7 +584,9 @@ public final class SimplePluginManager implements PluginManager {
- 
-     // Paper start
-     private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
-+        gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
-         server.getLogger().log(Level.SEVERE, msg, ex);
-+        gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
-         callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerPluginEnableDisableException(msg, ex, plugin)));
-     }
-     // Paper end
-@@ -654,9 +656,11 @@ public final class SimplePluginManager implements PluginManager {
-                             ));
-                 }
-             } catch (Throwable ex) {
-+                gg.pufferfish.pufferfish.sentry.SentryContext.setEventContext(event, registration); // Pufferfish
-                 // Paper start - error reporting
-                 String msg = "Could not pass event " + event.getEventName() + " to " + registration.getPlugin().getDescription().getFullName();
-                 server.getLogger().log(Level.SEVERE, msg, ex);
-+                gg.pufferfish.pufferfish.sentry.SentryContext.removeEventContext(); // Pufferfish
-                 if (!(event instanceof com.destroystokyo.paper.event.server.ServerExceptionEvent)) { // We don't want to cause an endless event loop
-                     callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
-                 }
-diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..301e82369603f3dd6e6c1bd380da4bacacd7ef6c 100644
---- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -336,7 +336,13 @@ public final class JavaPluginLoader implements PluginLoader {
-             try {
-                 jPlugin.setEnabled(true);
-             } catch (Throwable ex) {
-+                gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
-                 server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
-+                gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
-+                // Paper start - Disable plugins that fail to load
-+                this.server.getPluginManager().disablePlugin(jPlugin);
-+                return;
-+                // Paper end
-             }
- 
-             // Perhaps abort here, rather than continue going, but as it stands,
-@@ -361,7 +367,9 @@ public final class JavaPluginLoader implements PluginLoader {
-             try {
-                 jPlugin.setEnabled(false);
-             } catch (Throwable ex) {
-+                gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
-                 server.getLogger().log(Level.SEVERE, "Error occurred while disabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
-+                gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
-             }
- 
-             if (cloader instanceof PluginClassLoader) {
-diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 7e4f7cb2afbc145e532285c793573ad107bc3033..12449e18180d604e9cbbc744da74a8b222a18e1f 100644
---- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-@@ -50,6 +50,8 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
-     private io.papermc.paper.plugin.provider.classloader.PluginClassLoaderGroup classLoaderGroup; // Paper
-     public io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext; // Paper
- 
-+    private boolean closed = false; // Pufferfish
-+
-     static {
-         ClassLoader.registerAsParallelCapable();
-     }
-@@ -197,6 +199,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
-         throw new ClassNotFoundException(name);
-     }
- 
-+    public boolean _airplane_hasClass(@NotNull String name) { return this.classes.containsKey(name); } // Pufferfish
-     @Override
-     protected Class<?> findClass(String name) throws ClassNotFoundException {
-         if (name.startsWith("org.bukkit.") || name.startsWith("net.minecraft.")) {
-@@ -204,7 +207,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
-         }
-         Class<?> result = classes.get(name);
- 
--        if (result == null) {
-+        if (result == null && !this.closed) { // Pufferfish
-             String path = name.replace('.', '/').concat(".class");
-             JarEntry entry = jar.getJarEntry(path);
- 
-@@ -251,6 +254,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
-             this.setClass(name, result); // Paper
-         }
- 
-+        if (result == null) throw new ClassNotFoundException(name); // Pufferfish
-         return result;
-     }
- 
-@@ -265,6 +269,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
-             // Paper end
-             super.close();
-         } finally {
-+            this.closed = true; // Pufferfish
-             jar.close();
-         }
-     }

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

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

@@ -0,0 +1,93 @@
+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/0003-Use-Gradle-Version-Catalogs.patch

@@ -1,117 +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 0588b113b02a05e946dd92fce489662bc01a41eb..83f574f2314f11425eb9c4b11e8873c048f404ca 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -9,11 +9,13 @@ java {
-     withJavadocJar()
- }
- 
-+/* // Plazma - Use Gradle Version Catalogs
- val annotationsVersion = "24.0.1"
- val bungeeCordChatVersion = "1.20-R0.2"
- val adventureVersion = "4.15.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))
-@@ -27,6 +29,7 @@ configurations.api {
- }
- 
- dependencies {
-+    /* // Plazma - Use Gradle Version Catalogs
-     // api dependencies are listed transitively to API consumers
-     api("com.google.guava:guava:32.1.2-jre")
-     api("com.google.code.gson:gson:2.10.1")
-@@ -39,8 +42,34 @@ dependencies {
-     api("org.joml:joml:1.10.5")
-     // Paper start
-     api("com.googlecode.json-simple:json-simple:1.1.1") {
-+    // Plazma start - Use Gradle Version Catalogs
-+     */
-+    implementation(common.bundles.asm)
-+
-+    api(api.bundles.api)
-+    api(common.snakeyaml)
-+    api(common.log4j.api)
-+    api(common.maven.provider)
-+    api(api.jsonsimple) {
-         isTransitive = false // includes junit
-     }
-+
-+    apiAndDocs(common.bundles.adventure)
-+    apiAndDocs(platform(common.adventure.bom))
-+
-+    compileOnly(api.findbugs)
-+    compileOnly(api.annotations)
-+    compileOnly(common.bundles.maven)
-+
-+    compileOnlyApi(api.checkerqual)
-+
-+    testImplementation(common.asm.tree)
-+    testImplementation(common.bundles.test)
-+    testImplementation(common.commons.lang3)
-+
-+    testCompileOnly(api.bundles.annotations)
-+    /*
-+    // Plazma end - Use Gradle Version Catalogs
-     api("it.unimi.dsi:fastutil:8.5.6")
-     apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
-     apiAndDocs("net.kyori:adventure-api")
-@@ -76,6 +105,7 @@ dependencies {
-     testImplementation("org.hamcrest:hamcrest:2.2")
-     testImplementation("org.mockito:mockito-core:5.5.0")
-     testImplementation("org.ow2.asm:asm-tree:9.5")
-+     */ // Plazma - Use Gradle Version Catalogs
- }
- 
- // Paper start
-@@ -136,25 +166,27 @@ tasks.withType<Javadoc> {
-     options.use()
-     options.isDocFilesSubDirs = true
-     options.links(
--        "https://guava.dev/releases/32.1.2-jre/api/docs/",
--        "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
--        "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
-+        // 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}/", // Paper - we don't want Java 5 annotations
-         // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat
-         // Paper start - add missing javadoc links
--        "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html",
--        "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
-+        "https://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}",
-         // Paper end
-         // Paper start
--        "https://jd.advntr.dev/api/$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/",
-+        "https://jd.advntr.dev/api/${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.slf4j/slf4j-api/${api.slf4j.api.orNull?.version}/",
-+        "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/${common.log4j.api.orNull?.version}/",
-         // Paper end
--        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3", // Paper
-+        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/${common.maven.connector.orNull?.version}", // Paper
-+        // Plazma end - Use Gradle Version Catalogs
-     )
-     options.tags("apiNote:a:API Note:")
- 

patches/api/0004-Plazma-Configurations.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Plazma Configurations
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index be0e4c789a02d67160287c39cf6bdf8ef2229afc..2b3786560d8fb93b9899ebc1e0a7c96a808268d0 100644
+index ddb1ff894910761a78b91a343f32e129f03a03c4..bebe4116e50f0b0f64f6bdbd3f05f0b998225435 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2226,6 +2226,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2295,6 +2295,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Purpur end
  

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

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

patches/api/0006-Implement-No-Chat-Reports.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Thu, 28 Sep 2023 12:21:36 +0900
-Subject: [PATCH] Implement No Chat Reports
-
-
-diff --git a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
-index f7f864a2b46129e4d61bc87f3e23c343417aa094..eb3cc41388a210f000bf637bfae135081bee51e9 100644
---- a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
-@@ -216,6 +216,8 @@ public class PlayerKickEvent extends PlayerEvent implements Cancellable {
-          * Fallback cause
-          */
-         UNKNOWN,
-+
-+        NCR_NOT_INSTALLED, // Plazma - Implement No Chat Reports
-     }
-     // Paper end
- }

patches/api/0007-Always-allow-Java-17-on-SIMD.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alpha <dev@alpha93.kr>
-Date: Sun, 25 Feb 2024 14:14:18 +0900
-Subject: [PATCH] Always allow Java 17+ on SIMD
-
-
-diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
-index ab5fea0b03224bf249352ce340e94704ff713345..8dd1bad95e488f52ebbe23c15fd5db3d32aaebd1 100644
---- a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
-+++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
-@@ -15,7 +15,7 @@ public class SIMDChecker {
- 	@Deprecated
- 	public static boolean canEnable(Logger logger) {
- 		try {
--			if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19) {
-+			if (SIMDDetection.getJavaVersion() < 17) { // Plazma - Always allow Java 17+
- 				return false;
- 			} else {
- 				SIMDDetection.testRun = true;

patches/api/0007-Reduce-allocations.patch

@@ -0,0 +1,342 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Mon, 4 Nov 2024 16:04:55 +0900
+Subject: [PATCH] Reduce allocations
+
+
+diff --git a/src/main/java/io/papermc/paper/command/brigadier/BasicCommand.java b/src/main/java/io/papermc/paper/command/brigadier/BasicCommand.java
+index c89d6c4c38e2390cb11ffba182f8741d3726cfd1..2451f466ae6f953b01ad2cbaeac7d163f09f1c5c 100644
+--- a/src/main/java/io/papermc/paper/command/brigadier/BasicCommand.java
++++ b/src/main/java/io/papermc/paper/command/brigadier/BasicCommand.java
+@@ -16,6 +16,17 @@ import org.jspecify.annotations.Nullable;
+ @FunctionalInterface
+ public interface BasicCommand {
+ 
++    // Plazma start - Reduce allocations
++    /**
++     * Executes the command with the given {@link CommandSourceStack} and arguments.
++     *
++     * @param commandSourceStack the commandSourceStack of the command
++     */
++    default void execute(CommandSourceStack commandSourceStack) {
++        this.execute(commandSourceStack, org.plazmamc.plazma.constants.Null.STRING);
++    }
++    // Plazma end - Reduce allocations
++
+     /**
+      * Executes the command with the given {@link CommandSourceStack} and arguments.
+      *
+diff --git a/src/main/java/org/bukkit/Fluid.java b/src/main/java/org/bukkit/Fluid.java
+index a3ff4fefaf50f3e99a69ba68cbe8e30c95dac5df..5bbecd907e222f9adcf726bccab63c9ef59f5c14 100644
+--- a/src/main/java/org/bukkit/Fluid.java
++++ b/src/main/java/org/bukkit/Fluid.java
+@@ -10,6 +10,7 @@ import org.jetbrains.annotations.NotNull;
+  * Represents a fluid type.
+  */
+ public interface Fluid extends OldEnum<Fluid>, Keyed {
++    Fluid[] EMPTY_ARRAY = new Fluid[0]; // Plazma - Reduce allocations
+ 
+     /**
+      * No fluid.
+@@ -57,6 +58,6 @@ public interface Fluid extends OldEnum<Fluid>, Keyed {
+     @NotNull
+     @Deprecated(since = "1.21.3", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils
+     static Fluid[] values() {
+-        return Lists.newArrayList(Registry.FLUID).toArray(new Fluid[0]);
++        return Lists.newArrayList(Registry.FLUID).toArray(EMPTY_ARRAY); // Plazma - Reduce allocations
+     }
+ }
+diff --git a/src/main/java/org/bukkit/attribute/Attribute.java b/src/main/java/org/bukkit/attribute/Attribute.java
+index 521f035409ee61a9ad73d39bec938f2938892570..6e53135579426cb677bf34a0813db8268d550428 100644
+--- a/src/main/java/org/bukkit/attribute/Attribute.java
++++ b/src/main/java/org/bukkit/attribute/Attribute.java
+@@ -15,6 +15,7 @@ import org.jetbrains.annotations.NotNull;
+  * Types of attributes which may be present on an {@link Attributable}.
+  */
+ public interface Attribute extends OldEnum<Attribute>, Keyed, Translatable, net.kyori.adventure.translation.Translatable { // Paper - Adventure translations
++    Attribute[] EMPTY_ARRAY = new Attribute[0]; // Plazma - Reduce allocations
+ 
+     /**
+      * Maximum health of an Entity.
+@@ -170,6 +171,6 @@ public interface Attribute extends OldEnum<Attribute>, Keyed, Translatable, net.
+     @NotNull
+     @Deprecated(since = "1.21.3", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils
+     static Attribute[] values() {
+-        return Lists.newArrayList(Registry.ATTRIBUTE).toArray(new Attribute[0]);
++        return Lists.newArrayList(Registry.ATTRIBUTE).toArray(EMPTY_ARRAY); // Plazma - Reduce allocations
+     }
+ }
+diff --git a/src/main/java/org/bukkit/block/Biome.java b/src/main/java/org/bukkit/block/Biome.java
+index 464f8f81ba907a61588e4ab869e4f8269830195a..6d50664e76e6e7ed98ca7b311fdb368886ab65a8 100644
+--- a/src/main/java/org/bukkit/block/Biome.java
++++ b/src/main/java/org/bukkit/block/Biome.java
+@@ -23,6 +23,7 @@ import org.jetbrains.annotations.NotNull;
+  * which can be accessed via {@link Registry#BIOME}.
+  */
+ public interface Biome extends OldEnum<Biome>, Keyed, net.kyori.adventure.translation.Translatable { // Paper - Adventure translations
++    Biome[] EMPTY_ARRAY = new Biome[0]; // Plazma - Reduce allocations
+ 
+     Biome OCEAN = getBiome("ocean");
+     Biome PLAINS = getBiome("plains");
+@@ -129,7 +130,7 @@ public interface Biome extends OldEnum<Biome>, Keyed, net.kyori.adventure.transl
+     @NotNull
+     @Deprecated(since = "1.21.3", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils
+     static Biome[] values() {
+-        return Lists.newArrayList(Registry.BIOME).toArray(new Biome[0]);
++        return Lists.newArrayList(Registry.BIOME).toArray(EMPTY_ARRAY); // Plazma - Reduce allocations
+     }
+ 
+     // Paper start
+diff --git a/src/main/java/org/bukkit/block/banner/PatternType.java b/src/main/java/org/bukkit/block/banner/PatternType.java
+index 24b58ed80f3dd7c6b35bb18071000af845d18ba4..13ad0ba6320acd054a665d1749871a14cfd1a520 100644
+--- a/src/main/java/org/bukkit/block/banner/PatternType.java
++++ b/src/main/java/org/bukkit/block/banner/PatternType.java
+@@ -12,6 +12,8 @@ import org.jetbrains.annotations.NotNull;
+ import org.jetbrains.annotations.Nullable;
+ 
+ public interface PatternType extends OldEnum<PatternType>, Keyed {
++    PatternType[] EMPTY_ARRAY = new PatternType[0]; // Plazma - Reduce allocations
++
+     PatternType BASE = getType("base");
+     PatternType SQUARE_BOTTOM_LEFT = getType("square_bottom_left");
+     PatternType SQUARE_BOTTOM_RIGHT = getType("square_bottom_right");
+@@ -140,6 +142,6 @@ public interface PatternType extends OldEnum<PatternType>, Keyed {
+     @NotNull
+     @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils
+     static PatternType[] values() {
+-        return Lists.newArrayList(Registry.BANNER_PATTERN).toArray(new PatternType[0]);
++        return Lists.newArrayList(Registry.BANNER_PATTERN).toArray(EMPTY_ARRAY); // Plazma - Reduce allocations
+     }
+ }
+diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
+index 74384a56eebbce41d431db2507c55eddbcf50a41..ef3afe91312de1d0fb38d985e0421ceae59d7e57 100644
+--- a/src/main/java/org/bukkit/command/Command.java
++++ b/src/main/java/org/bukkit/command/Command.java
+@@ -58,6 +58,19 @@ public abstract class Command {
+         this.activeAliases = new ArrayList<String>(aliases);
+     }
+ 
++    // Plazma start - Reduce allocations
++    /**
++     * Executes the command, returning its success
++     *
++     * @param sender Source object which is executing this command
++     * @param commandLabel The alias of the command used
++     * @return true if the command was successful, otherwise false
++     */
++    public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel) {
++        return this.execute(sender, commandLabel, org.plazmamc.plazma.constants.Null.STRING);
++    }
++    // Plazma end - Reduce allocations
++
+     /**
+      * Executes the command, returning its success
+      *
+diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java
+index a824ac90e78d3d7f90b01397270e54422d88e8b9..95df10ad8a53942de435cec7db57c1bb496097dc 100644
+--- a/src/main/java/org/bukkit/enchantments/Enchantment.java
++++ b/src/main/java/org/bukkit/enchantments/Enchantment.java
+@@ -15,6 +15,8 @@ import org.jetbrains.annotations.Nullable;
+  * The various type of enchantments that may be added to armour or weapons
+  */
+ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adventure.translation.Translatable { // Paper - Adventure translations
++    private static final Enchantment[] EMPTY_ARRAY = new Enchantment[0]; // Plazma - Reduce allocations
++
+     /**
+      * Provides protection against environmental damage
+      */
+@@ -536,6 +538,6 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve
+     @NotNull
+     @Deprecated(since = "1.20.3")
+     public static Enchantment[] values() {
+-        return Lists.newArrayList(Registry.ENCHANTMENT).toArray(new Enchantment[0]);
++        return Lists.newArrayList(Registry.ENCHANTMENT).toArray(EMPTY_ARRAY); // Plazma - Reduce allocations
+     }
+ }
+diff --git a/src/main/java/org/bukkit/entity/Cat.java b/src/main/java/org/bukkit/entity/Cat.java
+index fca4671c6976aee9e981ef344244f9322651d0c9..7dc1744fba576683155e7970832794c05ceff768 100644
+--- a/src/main/java/org/bukkit/entity/Cat.java
++++ b/src/main/java/org/bukkit/entity/Cat.java
+@@ -51,6 +51,7 @@ public interface Cat extends Tameable, Sittable, io.papermc.paper.entity.CollarC
+      * Represents the various different cat types there are.
+      */
+     interface Type extends OldEnum<Type>, Keyed {
++        Type[] EMPTY_ARRAY = new Type[0]; // Plazma - Reduce allocations
+ 
+         Type TABBY = getType("tabby");
+         Type BLACK = getType("black");
+@@ -89,7 +90,7 @@ public interface Cat extends Tameable, Sittable, io.papermc.paper.entity.CollarC
+         @NotNull
+         @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils
+         static Type[] values() {
+-            return Lists.newArrayList(Registry.CAT_VARIANT).toArray(new Type[0]);
++            return Lists.newArrayList(Registry.CAT_VARIANT).toArray(EMPTY_ARRAY); // Plazma - Reduce allocations
+         }
+     }
+ 
+diff --git a/src/main/java/org/bukkit/entity/Frog.java b/src/main/java/org/bukkit/entity/Frog.java
+index f661a6b4797dd814a197e9245bcb2ddf2fca773f..58bf414cd753299abc54c45b3036d3fdbf9170dc 100644
+--- a/src/main/java/org/bukkit/entity/Frog.java
++++ b/src/main/java/org/bukkit/entity/Frog.java
+@@ -49,6 +49,7 @@ public interface Frog extends Animals {
+      * Represents the variant of a frog - ie its color.
+      */
+     interface Variant extends OldEnum<Variant>, Keyed {
++        Variant[] EMPTY_ARRAY = new Variant[0]; // Plazma - Reduce allocations
+ 
+         /**
+          * Temperate (brown-orange) frog.
+@@ -88,7 +89,7 @@ public interface Frog extends Animals {
+         @NotNull
+         @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils
+         static Variant[] values() {
+-            return Lists.newArrayList(Registry.FROG_VARIANT).toArray(new Variant[0]);
++            return Lists.newArrayList(Registry.FROG_VARIANT).toArray(EMPTY_ARRAY); // Plazma - Reduce allocations
+         }
+     }
+ }
+diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
+index 9c722a762c88a88bb5ef18c3b9eab8b371360dac..127bc2aab7fb36df206d53f3e6042bb6c920878e 100644
+--- a/src/main/java/org/bukkit/entity/Villager.java
++++ b/src/main/java/org/bukkit/entity/Villager.java
+@@ -170,6 +170,7 @@ public interface Villager extends AbstractVillager {
+      * in.
+      */
+     interface Type extends OldEnum<Type>, Keyed {
++        Type[] EMPTY_ARRAY = new Type[0]; // Plazma - Reduce allocations
+ 
+         Type DESERT = getType("desert");
+         Type JUNGLE = getType("jungle");
+@@ -204,7 +205,7 @@ public interface Villager extends AbstractVillager {
+         @NotNull
+         @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils
+         static Type[] values() {
+-            return Lists.newArrayList(Registry.VILLAGER_TYPE).toArray(new Type[0]);
++            return Lists.newArrayList(Registry.VILLAGER_TYPE).toArray(EMPTY_ARRAY); // Plazma - Reduce allocations
+         }
+     }
+ 
+@@ -213,6 +214,7 @@ public interface Villager extends AbstractVillager {
+      * Villagers have different trading options depending on their profession,
+      */
+     interface Profession extends OldEnum<Profession>, Keyed, net.kyori.adventure.translation.Translatable {
++        Profession[] EMPTY_ARRAY = new Profession[0]; // Plazma - Reduce allocations
+ 
+         Profession NONE = getProfession("none");
+         /**
+@@ -311,7 +313,7 @@ public interface Villager extends AbstractVillager {
+         @NotNull
+         @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils
+         static Profession[] values() {
+-            return Lists.newArrayList(Registry.VILLAGER_PROFESSION).toArray(new Profession[0]);
++            return Lists.newArrayList(Registry.VILLAGER_PROFESSION).toArray(EMPTY_ARRAY); // Plazma - Reduce allocations
+         }
+ 
+         // Paper start
+diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java
+index 7f5682c80ff25142e7c8fa14e03b4a62fc5c01d3..5fbcdf637b1e0162276e668d9ebe4a8648a29b8a 100644
+--- a/src/main/java/org/bukkit/map/MapCursor.java
++++ b/src/main/java/org/bukkit/map/MapCursor.java
+@@ -286,6 +286,7 @@ public final class MapCursor {
+      * resource pack.
+      */
+     public interface Type extends OldEnum<Type>, Keyed {
++        Type[] EMPTY_ARRAY = new Type[0]; // Plazma - Reduce allocations
+ 
+         Type PLAYER = getType("player");
+         Type FRAME = getType("frame");
+@@ -387,7 +388,7 @@ public final class MapCursor {
+         @NotNull
+         @Deprecated(since = "1.21", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils
+         static Type[] values() {
+-            return Lists.newArrayList(Registry.MAP_DECORATION_TYPE).toArray(new Type[0]);
++            return Lists.newArrayList(Registry.MAP_DECORATION_TYPE).toArray(EMPTY_ARRAY); // Plazma - Reduce allocations
+         }
+     }
+ 
+diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+index 2f8d3b7a5b25e323f892d2ec5eb7c3412a816ea4..22e358f7a83d84745c32ff9f04d79d51d8d92131 100644
+--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
++++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+@@ -47,6 +47,7 @@ import org.jetbrains.annotations.Nullable;
+ @Deprecated(forRemoval = true) // Paper - This implementation may be replaced in a future version of Paper.
+ // Plugins may still reflect into this class to modify permission logic for the time being.
+ public final class SimplePluginManager implements PluginManager {
++    public static final Plugin[] EMPTY_PLUGIN = new Plugin[0]; // Plazma - Reduce allocations
+     private final Server server;
+     private final Map<Pattern, PluginLoader> fileAssociations = new HashMap<Pattern, PluginLoader>();
+     private final List<Plugin> plugins = new ArrayList<Plugin>();
+@@ -133,7 +134,7 @@ public final class SimplePluginManager implements PluginManager {
+                     this.server.getLogger().log(Level.SEVERE, "Plugin loading error!", e);
+                 }
+             }
+-            return pluginList.toArray(new Plugin[0]);
++            return pluginList.toArray(EMPTY_PLUGIN); // Plazma - Reduce allocations
+         }
+         Preconditions.checkArgument(directory != null, "Directory cannot be null");
+         Preconditions.checkArgument(directory.isDirectory(), "Directory must be a directory");
+diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java
+index e4cfdc80c9e49fc7992183022bdf2f36aae0d95a..0cd7987e935e2b7ede759af3db9af04366930e19 100644
+--- a/src/main/java/org/bukkit/potion/PotionEffectType.java
++++ b/src/main/java/org/bukkit/potion/PotionEffectType.java
+@@ -19,6 +19,7 @@ import org.jetbrains.annotations.Nullable;
+  */
+ public abstract class PotionEffectType implements Keyed, Translatable, net.kyori.adventure.translation.Translatable, io.papermc.paper.world.flag.FeatureDependant { // Paper - implement Translatable & feature flag API
+     private static final BiMap<Integer, PotionEffectType> ID_MAP = HashBiMap.create();
++    private static final PotionEffectType[] EMPTY_ARRAY = new PotionEffectType[0]; // Plazma - Reduce allocations
+ 
+     /**
+      * Increases movement speed.
+@@ -358,7 +359,7 @@ public abstract class PotionEffectType implements Keyed, Translatable, net.kyori
+     @NotNull
+     @Deprecated(since = "1.20.3")
+     public static PotionEffectType[] values() {
+-        return Lists.newArrayList(Registry.EFFECT).toArray(new PotionEffectType[0]);
++        return Lists.newArrayList(Registry.EFFECT).toArray(EMPTY_ARRAY); // Plazma - Reduce allocations
+     }
+ 
+     // Paper start
+diff --git a/src/main/java/org/plazmamc/plazma/Constants.java b/src/main/java/org/plazmamc/plazma/Constants.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..137f4f511998828476c2ac408a9a76289a44d071
+--- /dev/null
++++ b/src/main/java/org/plazmamc/plazma/Constants.java
+@@ -0,0 +1,7 @@
++package org.plazmamc.plazma;
++
++public interface Constants {
++
++    int[] ZERO_INT_ARRAY = new int[]{0};
++
++}
+diff --git a/src/main/java/org/plazmamc/plazma/constants/Null.java b/src/main/java/org/plazmamc/plazma/constants/Null.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..6018a9230d0d92e23f09cc5b5cc042446bed9962
+--- /dev/null
++++ b/src/main/java/org/plazmamc/plazma/constants/Null.java
+@@ -0,0 +1,25 @@
++package org.plazmamc.plazma.constants;
++
++import net.md_5.bungee.api.chat.BaseComponent;
++import java.net.URL;
++import java.util.concurrent.CompletableFuture;
++import java.util.regex.Pattern;
++
++public interface Null {
++
++    byte[] BYTE = new byte[0];
++    short[] SHORT = new short[0];
++    int[] INT = new int[0];
++    long[] LONG = new long[0];
++
++    Object[] OBJECT = new Object[0];
++    String[] STRING = new String[0];
++    URL[] URL = new URL[0];
++    Pattern[] REGEX = new Pattern[0];
++
++    BaseComponent[] COMPONENT = new BaseComponent[0];
++
++    @SuppressWarnings("rawtypes")
++    CompletableFuture[] FUTURE = new CompletableFuture[0];
++
++}

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

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

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

@@ -25,10 +25,10 @@ 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 069f2668f5229b0368b796e65eef1648fba0a097..9b991201a2f6cc9feccccf7f4e7bcded64117764 100644
+index 35dfd25f21ca67b7f4d69326500980f4a021ef49..a9816fbfa466b3fe3f82c19aeeeb564c660e4b6a 100644
 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -442,6 +442,18 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+@@ -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);
  
@@ -44,6 +44,6 @@ index 069f2668f5229b0368b796e65eef1648fba0a097..9b991201a2f6cc9feccccf7f4e7bcded
 +    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) {
-      * Removed in 1.20.2
+         return GoalKey.of(type, NamespacedKey.minecraft(key));
-      */
+     }

patches/mojang-api/0001-Rebrand.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alpha <dev@alpha93.kr>
-Date: Tue, 27 Feb 2024 18:36:43 +0900
-Subject: [PATCH] Rebrand
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index a278ee93d7001e8dc7fd2f5409c2f528c637cb2f..a00cf1659f1fd9dff3ff34561d78732645b51dfb 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -9,7 +9,7 @@ java {
- }
- 
- dependencies {
--    implementation(project(":paper-api"))
-+    implementation(project(":plazma-api")) // Plazma - Rebrand
-     api("com.mojang:brigadier:1.0.18")
- 
-     compileOnly("it.unimi.dsi:fastutil:8.5.6")

patches/placeholder/server/0007-Development-Build.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Fri, 26 Jan 2024 15:34:53 +0900
-Subject: [PATCH] Development Build
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index b04d3eea789f77b2435cb0192635f1be1bab597d..a58ce2c893d8c755ab3027207d512542d2d57c36 100644
---- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -24,7 +24,7 @@ public class PaperVersionFetcher implements VersionFetcher {
-     private static int distance = -2; public int distance() { return distance; }
-     // Purpur end
-     private static @Nullable String mcVer;
--    private static final boolean DEVELOPMENT = false; // Plazma
-+    private static final boolean DEVELOPMENT = true; // Plazma
- 
-     @Override
-     public long getCacheTime() {

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

@@ -0,0 +1,71 @@
+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..f8cdd6911fe9d6402455b7368d0e98c25e9511ca 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 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

@@ -0,0 +1,19 @@
+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 34e8eb828be517d9ee3973597c74c5cac3d75c99..f8575f94a389d87d8043ae838720dbe2247235c4 100644
+--- a/src/main/java/net/minecraft/world/level/Level.java
++++ b/src/main/java/net/minecraft/world/level/Level.java
+@@ -1697,7 +1697,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/0003-Use-Gradle-Version-Catalogs.patch

@@ -1,96 +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] Use Gradle Version Catalogs
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 32366253c04c493135f2b22d1940f83669104723..be06b9b282c53bc135963447e19185d9ff41d19a 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -19,21 +19,37 @@ dependencies {
-         exclude("io.papermc.paper", "paper-api")
-     }
-     // Purpur end
-+    // Plazma start - Use Gradle version catalogs
-+    /*
-     // Paper start
-     implementation("org.jline:jline-terminal-jansi:3.21.0")
-     implementation("net.minecrell:terminalconsoleappender:1.3.0")
-     implementation("net.kyori:adventure-text-serializer-ansi:4.14.0") // Keep in sync with adventureVersion from Paper-API build file
-     implementation("net.kyori:ansi:1.0.3") // Manually bump beyond above transitive dep
--    /*
--          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
-+     */
-+    log4jPlugins.annotationProcessorConfigurationName(common.log4j.core)
-+
-+    implementation(common.log4j.core)
-+    implementation(common.log4j.iostreams)
-+    implementation(common.snakeyaml)
-+    implementation(common.bundles.asm)
-+    implementation(common.commons.lang2)
-+    implementation(common.adventure.serializer.ansi)
-+    implementation(server.ansi)
-+    implementation(server.bundles.implementation)
-+
-+    runtimeOnly(common.bundles.maven)
-+    runtimeOnly(common.maven.provider)
-+    runtimeOnly(server.bundles.runtime)
-     runtimeOnly(log4jPlugins.output)
-+
-     alsoShade(log4jPlugins.output)
-+
-+    testImplementation(common.bundles.test)
-+    testImplementation(server.bundles.test)
-+    /*
-     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.19.0") // Paper - remove exclusion
-@@ -46,10 +62,13 @@ dependencies {
-     runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
-     // Paper start - Use Velocity cipher
-     implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {
-+     */
-+    implementation(server.velocity) {
-         isTransitive = false
-     }
-     // Paper end - Use Velocity cipher
- 
-+     /*
-     runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
-@@ -57,20 +76,25 @@ dependencies {
-     // Pufferfish start
-     implementation("org.yaml:snakeyaml:1.32")
-     implementation ("com.github.carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
-+     */
-+    implementation(server.simpleyaml) {
-         exclude(group="org.yaml", module="snakeyaml")
-     }
-     // Pufferfish end
- 
--    implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
--    implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
-+    //implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
-+    //implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
-     implementation("dev.omega24:upnp4j:1.0") // Purpur
- 
-+    /*
-     testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
-     testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
-     testImplementation("org.hamcrest:hamcrest:2.2")
-     testImplementation("org.mockito:mockito-core:5.5.0")
-     testImplementation("org.ow2.asm:asm-tree:9.5")
-     testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest
-+     */
-+    // Plazma end - Use Gradle Version Catalogs
- }
- 
- val craftbukkitPackageVersion = "1_20_R3" // Paper

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

@@ -0,0 +1,130 @@
+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 77602e4445b1b45a17e5552ac6a769e0ed46ebc7..f021047331c7eb3dac7f0d56af73a9056ffe826b 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -26,71 +26,34 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
+ 
+ dependencies {
+     implementation(project(":purpur-api")) // Pufferfish // Paper // Purpur
+-    // 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.22.1") // Paper - remove exclusion
+-    implementation("org.ow2.asm:asm-commons:9.7.1")
+-    implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
+-    implementation("commons-lang:commons-lang:2.6")
+-    runtimeOnly("org.xerial:sqlite-jdbc:3.46.1.3")
+-    runtimeOnly("com.mysql:mysql-connector-j:9.1.0")
+-    runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
+-    // Paper start - Use Velocity cipher
+-    implementation("com.velocitypowered:velocity-native:3.3.0-SNAPSHOT") {
+-        isTransitive = false
+-    }
+-    // Paper end - Use Velocity cipher
+-
+-    runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
+-    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
+-    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
+-
+-    // Pufferfish start
+-    implementation("org.yaml:snakeyaml:1.32")
+-    implementation ("com.github.carleslc.Simple-YAML:Simple-Yaml:1.8.4") { // Purpur
+-        exclude(group="org.yaml", module="snakeyaml")
+-    }
+-    // Pufferfish end
+-
+-    implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
+-    implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
+-    implementation("dev.omega24:upnp4j:1.0") // Purpur
+-
+-    testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
+-    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
+-    testImplementation("org.junit.platform:junit-platform-suite-engine:1.10.0")
+-    testImplementation("org.hamcrest:hamcrest:2.2")
+-    testImplementation("org.mockito:mockito-core:5.14.1")
+-    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
++    // Plazma start - Use Gradle Version Catalogs
++    implementation(server.bundles.implementation)
++    implementation(common.adventure.serializer.ansi)
++    implementation(common.log4j.stream)
++ 
++    implementation(common.log4j)
++    log4jPlugins.annotationProcessorConfigurationName(common.log4j)
++    runtimeOnly(log4jPlugins.output) // diff on change
++    alsoShade(log4jPlugins.output) // diff on change
++ 
++    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(common.snakeyaml)
++    implementation(server.simpleyaml) { exclude(group="org.yaml", module="snakeyaml") }
++ 
++    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 {
+@@ -118,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
++            "Implementation-Title" to rootProject.providers.gradleProperty("brandName").get(), // Pufferfish // Purpur // Plazma - Fork-friendly Rebranding
+             "Implementation-Version" to implementationVersion,
+             "Implementation-Vendor" to date, // Paper
+-            "Specification-Title" to "Purpur", // Pufferfish // Purpur
++            "Specification-Title" to rootProject.providers.gradleProperty("brandName").get(), // Pufferfish // Purpur // Plazma - Fork-friendly Rebranding
+             "Specification-Version" to project.version,
+-            "Specification-Vendor" to "Purpur Team", // Pufferfish // Purpur
+-            "Brand-Id" to "purpurmc:purpur", // Pufferfish // Purpur
+-            "Brand-Name" to "Purpur", // Pufferfish // Purpur
++            "Specification-Vendor" to rootProject.providers.gradleProperty("providerName").get(), // Purpur // Plazma - Fork-friendly Rebranding
++            "Brand-Id" to rootProject.providers.gradleProperty("brandKey").get(), // Purpur // Plazma - Fork-friendly Rebranding
++            "Brand-Name" to rootProject.providers.gradleProperty("brandName").get(), // Pufferfish // Purpur // Plazma - Fork-friendly Rebranding
+             "Build-Number" to (build ?: ""),
+             "Build-Time" to Instant.now().toString(),
+             "Git-Branch" to gitBranch, // Paper

patches/server/0004-MC-Dev-fixes.patch

@@ -1,60 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: IPECTER <ipectert@gmail.com>
-Date: Tue, 30 May 2023 12:12:29 +0900
-Subject: [PATCH] MC Dev fixes
-
-
-diff --git a/src/main/java/net/minecraft/util/datafix/fixes/LeavesFix.java b/src/main/java/net/minecraft/util/datafix/fixes/LeavesFix.java
-index 733134401fcba393053c7a2dfa1d0d44f8f79ff5..79fba35fc74723529bff7d8fdcca7de6407fb5ad 100644
---- a/src/main/java/net/minecraft/util/datafix/fixes/LeavesFix.java
-+++ b/src/main/java/net/minecraft/util/datafix/fixes/LeavesFix.java
-@@ -71,14 +71,14 @@ public class LeavesFix extends DataFix {
-             return this.fixTypeEverywhereTyped("Leaves fix", type, (typed) -> {
-                 return typed.updateTyped(opticFinder, (typedx) -> {
-                     int[] is = new int[]{0};
--                    Typed<?> typed2 = typedx.updateTyped(opticFinder2, (typed) -> {
--                        Int2ObjectMap<LeavesFix.LeavesSection> int2ObjectMap = new Int2ObjectOpenHashMap<>(typed.getAllTyped(opticFinder3).stream().map((typedx) -> {
--                            return new LeavesFix.LeavesSection(typedx, this.getInputSchema());
-+                    Typed<?> typed2 = typedx.updateTyped(opticFinder2, (typed2x) -> { // Plazma - decompile fix
-+                        Int2ObjectMap<LeavesFix.LeavesSection> int2ObjectMap = new Int2ObjectOpenHashMap<>(typed2x.getAllTyped(opticFinder3).stream().map((typedx2) -> { // Plazma - decompile fix
-+                            return new LeavesFix.LeavesSection(typedx2, this.getInputSchema()); // Plazma - decompile fix
-                         }).collect(Collectors.toMap(LeavesFix.Section::getIndex, (leavesSection) -> {
-                             return leavesSection;
-                         })));
-                         if (int2ObjectMap.values().stream().allMatch(LeavesFix.Section::isSkippable)) {
--                            return typed;
-+                            return typed2x; // Plazma - decompile fix
-                         } else {
-                             List<IntSet> list = Lists.newArrayList();
- 
-@@ -134,8 +134,8 @@ public class LeavesFix extends DataFix {
-                                 }
-                             }
- 
--                            return typed.updateTyped(opticFinder3, (typedx) -> {
--                                return int2ObjectMap.get(typedx.get(DSL.remainderFinder()).get("Y").asInt(0)).write(typedx);
-+                            return typed.updateTyped(opticFinder3, (typedx2) -> { // Plazma - decompile fix
-+                                return int2ObjectMap.get(typedx2.get(DSL.remainderFinder()).get("Y").asInt(0)).write(typedx2); // Plazma - decompile fix
-                             });
-                         }
-                     });
-@@ -298,8 +298,8 @@ public class LeavesFix extends DataFix {
-                 throw new IllegalStateException("Block state type is not what was expected.");
-             } else {
-                 Optional<List<Pair<String, Dynamic<?>>>> optional = typed.getOptional(this.paletteFinder);
--                this.palette = optional.map((list) -> {
--                    return list.stream().map(Pair::getSecond).collect(Collectors.toList());
-+                this.palette = (List) optional.map((list) -> { // Plazma - decompile fix
-+                    return (List) list.stream().map(Pair::getSecond).collect(Collectors.toList()); // Plazma - decompile fix
-                 }).orElse(ImmutableList.of());
-                 Dynamic<?> dynamic = typed.get(DSL.remainderFinder());
-                 this.index = dynamic.get("Y").asInt(0);
-@@ -321,7 +321,7 @@ public class LeavesFix extends DataFix {
-         public Typed<?> write(Typed<?> typed) {
-             return this.isSkippable() ? typed : typed.update(DSL.remainderFinder(), (dynamic) -> {
-                 return dynamic.set("BlockStates", dynamic.createLongList(Arrays.stream(this.storage.getRaw())));
--            }).set(this.paletteFinder, this.palette.stream().map((dynamic) -> {
-+            }).set(this.paletteFinder, (List) this.palette.stream().map((dynamic) -> { // Plazma - decompile fix
-                 return Pair.of(References.BLOCK_STATE.typeName(), dynamic);
-             }).collect(Collectors.toList()));
-         }

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

@@ -0,0 +1,438 @@
+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/build.gradle.kts b/build.gradle.kts
+index f021047331c7eb3dac7f0d56af73a9056ffe826b..41005f58fdd526907972185e728bbe1fa97171e9 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -25,7 +25,7 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
+ // Paper end - configure mockito agent that is needed in newer java versions
+ 
+ dependencies {
+-    implementation(project(":purpur-api")) // Pufferfish // Paper // Purpur
++    implementation(project(":plazma-api")) // Pufferfish // Paper // Purpur // Plazma
+     // Plazma start - Use Gradle Version Catalogs
+     implementation(server.bundles.implementation)
+     implementation(common.adventure.serializer.ansi)
+diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
+index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..8d5a52c5762c3d9b44dcdf00ae312e0bdc01fa1f 100644
+--- a/src/main/java/com/destroystokyo/paper/Metrics.java
++++ b/src/main/java/com/destroystokyo/paper/Metrics.java
+@@ -593,7 +593,7 @@ public class Metrics {
+             boolean logFailedRequests = config.getBoolean("logFailedRequests", false);
+             // Only start Metrics, if it's enabled in the config
+             if (config.getBoolean("enabled", true)) {
+-                Metrics metrics = new Metrics("Purpur", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur
++                Metrics metrics = new Metrics(io.papermc.paper.ServerBrandConstants.BRAND_NAME, serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur // Plazma - Fork-friendly Rebranding
+ 
+                 metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
+                     String minecraftVersion = Bukkit.getVersion();
+diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+index 6d36fc6d8e22d9b68dea3830f6ecc8763184c343..6995627310de4911d87a2f93a723d6b93dc0612f 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
++++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+@@ -36,7 +36,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+     private static final int DISTANCE_ERROR = -1;
+     private static final int DISTANCE_UNKNOWN = -2;
+     // Purpur start
+-    private static final String DOWNLOAD_PAGE = "https://purpurmc.org/downloads";
++    // private static final String DOWNLOAD_PAGE = "https://purpurmc.org/downloads"; // Plazma - Fork-friendly Rebranding
+     private static int distance = DISTANCE_UNKNOWN; public int distance() { return distance; }
+     // Purpur end
+ 
+@@ -52,7 +52,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+         if (build.buildNumber().isEmpty() && build.gitCommit().isEmpty()) {
+             updateMessage = text("You are running a development version without access to version information", color(0xFF5300));
+         } else {
+-            updateMessage = getUpdateStatusMessage("PurpurMC/Purpur", build); // Purpur
++            updateMessage = getUpdateStatusMessage("PlazmaMC/Plazma", build); // Purpur // Plazma - Fork-friendly Rebranding
+         }
+         final @Nullable Component history = this.getHistory();
+ 
+@@ -63,8 +63,12 @@ public class PaperVersionFetcher implements VersionFetcher {
+         //int distance = DISTANCE_ERROR; // Purpur - use field
+ 
+         final OptionalInt buildNumber = build.buildNumber();
+-        if (buildNumber.isPresent()) {
+-            distance = fetchDistanceFromSiteApi(build, buildNumber.getAsInt());
++        // Plazma start - TODO: CI Checking
++        //noinspection PointlessBooleanExpression
++        if (false && buildNumber.isPresent()) {
++            throw new UnsupportedOperationException("Version fetching from CI is not supported yet");
++            // distance = fetchDistanceFromSiteApi(build, buildNumber.getAsInt());
++        // Plazma end - TODO: CI Checking
+         } else {
+             final Optional<String> gitBranch = build.gitBranch();
+             final Optional<String> gitCommit = build.gitCommit();
+@@ -80,12 +84,13 @@ public class PaperVersionFetcher implements VersionFetcher {
+             default -> text("* You are " + distance + " version(s) behind", NamedTextColor.YELLOW) // Purpur
+                 .append(Component.newline())
+                 .append(text("Download the new version at: ")
+-                    .append(text(DOWNLOAD_PAGE, NamedTextColor.GOLD)
++                    .append(text(io.papermc.paper.ServerBrandConstants.DOWNLOAD_PAGE, NamedTextColor.GOLD) // Plazma - Fork-friendly Rebranding
+                         .hoverEvent(text("Click to open", NamedTextColor.WHITE))
+-                        .clickEvent(ClickEvent.openUrl(DOWNLOAD_PAGE))));
++                        .clickEvent(ClickEvent.openUrl(io.papermc.paper.ServerBrandConstants.DOWNLOAD_PAGE)))); // Plazma - Fork-friendly Rebranding
+         };
+     }
+ 
++    /* // Plazma - TODO: CI Checking
+     private static int fetchDistanceFromSiteApi(final ServerBuildInfo build, final int jenkinsBuild) {
+         try {
+             try (final BufferedReader reader = Resources.asCharSource(
+@@ -105,6 +110,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+             return DISTANCE_ERROR;
+         }
+     }
++     */ // Plazma - TODO: CI Checking
+ 
+     // Contributed by Techcable <Techcable@outlook.com> in GH-65
+     private static int fetchDistanceFromGitHub(final String repo, final String branch, final String hash) {
+diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
+index 90b3526479320064378f2cde6c2f2b8e48a59ba6..21658c61ad091647d5421d1dbf892d03ca175c74 100644
+--- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
++++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
+@@ -20,7 +20,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
+     @Override
+     protected LineReader buildReader(LineReaderBuilder builder) {
+         builder
+-                .appName("Purpur") // Purpur
++                .appName(io.papermc.paper.ServerBrandConstants.BRAND_NAME) // Purpur // Plazma - Fork-friendly Rebranding
+                 .variable(LineReader.HISTORY_FILE, java.nio.file.Paths.get(".console_history"))
+                 .completer(new ConsoleCommandCompleter(this.server))
+                 .option(LineReader.Option.COMPLETE_IN_WORD, true);
+diff --git a/src/main/java/io/papermc/paper/ServerBrandConstants.java b/src/main/java/io/papermc/paper/ServerBrandConstants.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..3af005ce2bbd30601917987d8c831db23c733ab8
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/ServerBrandConstants.java
+@@ -0,0 +1,29 @@
++package io.papermc.paper;
++
++import org.jetbrains.annotations.Nullable;
++
++public interface ServerBrandConstants {
++
++    // Basic brand informations
++    String BRAND_NAME = "Plazma";
++    String RESOURCE_PATH = "META-INF/maven/org.plazmamc.plazma/plazma-api/pom.properties";
++
++    @Nullable
++    String ASCII_LOGO = """
++        
++        \033[38;2;215;23;133m█\033[38;2;212;24;134m█\033[38;2;209;26;134m█\033[38;2;205;27;135m█\033[38;2;202;28;136m█\033[38;2;199;30;136m█\033[38;2;196;31;137m╗\033[38;2;193;33;138m  \033[38;2;190;34;138m█\033[38;2;186;35;139m█\033[38;2;183;37;140m╗\033[38;2;180;38;140m \033[38;2;177;39;141m \033[38;2;174;41;142m \033[38;2;170;42;142m \033[38;2;167;43;143m  \033[38;2;164;45;144m \033[38;2;161;46;144m█\033[38;2;158;47;145m█\033[38;2;155;49;146m█\033[38;2;151;50;146m█\033[38;2;148;52;147m█\033[38;2;145;53;148m╗\033[38;2;142;54;148m  \033[38;2;139;56;149m█\033[38;2;135;57;149m█\033[38;2;132;58;150m█\033[38;2;129;60;151m█\033[38;2;126;61;151m█\033[38;2;123;62;152m█\033[38;2;120;64;153m█\033[38;2;116;65;153m╗ \033[38;2;113;67;154m█\033[38;2;110;68;155m█\033[38;2;107;69;155m█\033[38;2;104;71;156m╗\033[38;2;101;72;157m \033[38;2;97;73;157m \033[38;2;94;75;158m \033[38;2;91;76;159m█\033[38;2;88;77;159m█\033[38;2;85;79;160m█\033[38;2;81;80;161m╗ \033[38;2;78;81;161m \033[38;2;75;83;162m█\033[38;2;72;84;163m█\033[38;2;69;86;163m█\033[38;2;66;87;164m█\033[38;2;62;88;165m█\033[38;2;59;90;165m╗\033[38;2;56;91;166m\s
++        \033[38;2;215;23;133m█\033[38;2;212;24;134m█\033[38;2;209;26;134m╔\033[38;2;205;27;135m═\033[38;2;202;28;136m═\033[38;2;199;30;136m█\033[38;2;196;31;137m█\033[38;2;193;33;138m╗ \033[38;2;190;34;138m█\033[38;2;186;35;139m█\033[38;2;183;37;140m║\033[38;2;180;38;140m \033[38;2;177;39;141m \033[38;2;174;41;142m \033[38;2;170;42;142m \033[38;2;167;43;143m  \033[38;2;164;45;144m█\033[38;2;161;46;144m█\033[38;2;158;47;145m╔\033[38;2;155;49;146m═\033[38;2;151;50;146m═\033[38;2;148;52;147m█\033[38;2;145;53;148m█\033[38;2;142;54;148m╗ \033[38;2;139;56;149m╚\033[38;2;135;57;149m═\033[38;2;132;58;150m═\033[38;2;129;60;151m█\033[38;2;126;61;151m█\033[38;2;123;62;152m█\033[38;2;120;64;153m╔\033[38;2;116;65;153m╝ \033[38;2;113;67;154m█\033[38;2;110;68;155m█\033[38;2;107;69;155m█\033[38;2;104;71;156m█\033[38;2;101;72;157m╗\033[38;2;97;73;157m \033[38;2;94;75;158m█\033[38;2;91;76;159m█\033[38;2;88;77;159m█\033[38;2;85;79;160m█\033[38;2;81;80;161m║ \033[38;2;78;81;161m█\033[38;2;75;83;162m█\033[38;2;72;84;163m╔\033[38;2;69;86;163m═\033[38;2;66;87;164m═\033[38;2;62;88;165m█\033[38;2;59;90;165m█\033[38;2;56;91;166m╗
++        \033[38;2;215;23;133m█\033[38;2;212;24;134m█\033[38;2;209;26;134m█\033[38;2;205;27;135m█\033[38;2;202;28;136m█\033[38;2;199;30;136m█\033[38;2;196;31;137m╔\033[38;2;193;33;138m╝ \033[38;2;190;34;138m█\033[38;2;186;35;139m█\033[38;2;183;37;140m║\033[38;2;180;38;140m \033[38;2;177;39;141m \033[38;2;174;41;142m \033[38;2;170;42;142m \033[38;2;167;43;143m  \033[38;2;164;45;144m█\033[38;2;161;46;144m█\033[38;2;158;47;145m█\033[38;2;155;49;146m█\033[38;2;151;50;146m█\033[38;2;148;52;147m█\033[38;2;145;53;148m█\033[38;2;142;54;148m║ \033[38;2;139;56;149m \033[38;2;135;57;149m \033[38;2;132;58;150m█\033[38;2;129;60;151m█\033[38;2;126;61;151m█\033[38;2;123;62;152m╔\033[38;2;120;64;153m╝\033[38;2;116;65;153m  \033[38;2;113;67;154m█\033[38;2;110;68;155m█\033[38;2;107;69;155m╔\033[38;2;104;71;156m█\033[38;2;101;72;157m█\033[38;2;97;73;157m█\033[38;2;94;75;158m█\033[38;2;91;76;159m╔\033[38;2;88;77;159m█\033[38;2;85;79;160m█\033[38;2;81;80;161m║ \033[38;2;78;81;161m█\033[38;2;75;83;162m█\033[38;2;72;84;163m█\033[38;2;69;86;163m█\033[38;2;66;87;164m█\033[38;2;62;88;165m█\033[38;2;59;90;165m█\033[38;2;56;91;166m║
++        \033[38;2;215;23;133m█\033[38;2;212;24;134m█\033[38;2;209;26;134m╔\033[38;2;205;27;135m═\033[38;2;202;28;136m═\033[38;2;199;30;136m═\033[38;2;196;31;137m╝\033[38;2;193;33;138m  \033[38;2;190;34;138m█\033[38;2;186;35;139m█\033[38;2;183;37;140m║\033[38;2;180;38;140m \033[38;2;177;39;141m \033[38;2;174;41;142m \033[38;2;170;42;142m \033[38;2;167;43;143m  \033[38;2;164;45;144m█\033[38;2;161;46;144m█\033[38;2;158;47;145m╔\033[38;2;155;49;146m═\033[38;2;151;50;146m═\033[38;2;148;52;147m█\033[38;2;145;53;148m█\033[38;2;142;54;148m║ \033[38;2;139;56;149m \033[38;2;135;57;149m█\033[38;2;132;58;150m█\033[38;2;129;60;151m█\033[38;2;126;61;151m╔\033[38;2;123;62;152m╝\033[38;2;120;64;153m \033[38;2;116;65;153m  \033[38;2;113;67;154m█\033[38;2;110;68;155m█\033[38;2;107;69;155m║\033[38;2;104;71;156m╚\033[38;2;101;72;157m█\033[38;2;97;73;157m█\033[38;2;94;75;158m╔\033[38;2;91;76;159m╝\033[38;2;88;77;159m█\033[38;2;85;79;160m█\033[38;2;81;80;161m║ \033[38;2;78;81;161m█\033[38;2;75;83;162m█\033[38;2;72;84;163m╔\033[38;2;69;86;163m═\033[38;2;66;87;164m═\033[38;2;62;88;165m█\033[38;2;59;90;165m█\033[38;2;56;91;166m║
++        \033[38;2;215;23;133m█\033[38;2;212;24;134m█\033[38;2;209;26;134m║\033[38;2;205;27;135m \033[38;2;202;28;136m \033[38;2;199;30;136m \033[38;2;196;31;137m \033[38;2;193;33;138m  \033[38;2;190;34;138m█\033[38;2;186;35;139m█\033[38;2;183;37;140m█\033[38;2;180;38;140m█\033[38;2;177;39;141m█\033[38;2;174;41;142m█\033[38;2;170;42;142m█\033[38;2;167;43;143m╗ \033[38;2;164;45;144m█\033[38;2;161;46;144m█\033[38;2;158;47;145m║\033[38;2;155;49;146m \033[38;2;151;50;146m \033[38;2;148;52;147m█\033[38;2;145;53;148m█\033[38;2;142;54;148m║ \033[38;2;139;56;149m█\033[38;2;135;57;149m█\033[38;2;132;58;150m█\033[38;2;129;60;151m█\033[38;2;126;61;151m█\033[38;2;123;62;152m█\033[38;2;120;64;153m█\033[38;2;116;65;153m╗ \033[38;2;113;67;154m█\033[38;2;110;68;155m█\033[38;2;107;69;155m║\033[38;2;104;71;156m \033[38;2;101;72;157m╚\033[38;2;97;73;157m═\033[38;2;94;75;158m╝\033[38;2;91;76;159m \033[38;2;88;77;159m█\033[38;2;85;79;160m█\033[38;2;81;80;161m║ \033[38;2;78;81;161m█\033[38;2;75;83;162m█\033[38;2;72;84;163m║\033[38;2;69;86;163m \033[38;2;66;87;164m \033[38;2;62;88;165m█\033[38;2;59;90;165m█\033[38;2;56;91;166m║
++        \033[38;2;215;23;133m╚\033[38;2;212;24;134m═\033[38;2;209;26;134m╝\033[38;2;205;27;135m \033[38;2;202;28;136m \033[38;2;199;30;136m \033[38;2;196;31;137m \033[38;2;193;33;138m  \033[38;2;190;34;138m╚\033[38;2;186;35;139m═\033[38;2;183;37;140m═\033[38;2;180;38;140m═\033[38;2;177;39;141m═\033[38;2;174;41;142m═\033[38;2;170;42;142m═\033[38;2;167;43;143m╝ \033[38;2;164;45;144m╚\033[38;2;161;46;144m═\033[38;2;158;47;145m╝\033[38;2;155;49;146m \033[38;2;151;50;146m \033[38;2;148;52;147m╚\033[38;2;145;53;148m═\033[38;2;142;54;148m╝ \033[38;2;139;56;149m╚\033[38;2;135;57;149m═\033[38;2;132;58;150m═\033[38;2;129;60;151m═\033[38;2;126;61;151m═\033[38;2;123;62;152m═\033[38;2;120;64;153m═\033[38;2;116;65;153m╝ \033[38;2;113;67;154m╚\033[38;2;110;68;155m═\033[38;2;107;69;155m╝\033[38;2;104;71;156m \033[38;2;101;72;157m \033[38;2;97;73;157m \033[38;2;94;75;158m \033[38;2;91;76;159m \033[38;2;88;77;159m╚\033[38;2;85;79;160m═\033[38;2;81;80;161m╝ \033[38;2;78;81;161m╚\033[38;2;75;83;162m═\033[38;2;72;84;163m╝\033[38;2;69;86;163m \033[38;2;66;87;164m \033[38;2;62;88;165m╚\033[38;2;59;90;165m═\033[38;2;56;91;166m╝\033[0m
++        """;
++
++    // Support URLs
++    String DOWNLOAD_PAGE = "https://plazmamc.org/downloads";
++    String CONFIG_REFERENCE = "https://docs.plazmamc.org/plazma/administration/reference/configurations";
++    String START_GUIDE = "https://docs.plazmamc.org/plazma/administration/getting-started";
++    String USAGE_GUIDE = "https://docs.plazmamc.org/plazma/administration/getting-started/next-step";
++    String SUPPORT_PAGE = "https://github.com/PlazmaMC/Plazma/issues";
++
++}
+diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
+index 3099c21ee589acf6edff5903a23673adf489024f..a337e2c9576fb70a8ee9082e9b69719c804b286e 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
+-    private static final String BRAND_PURPUR_NAME = "Purpur"; // Purpur
+-
+     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
++                .orElse(BRAND_ID), // Purpur // Plazma - Fork-friendly Rebranding
+             getManifestAttribute(manifest, ATTRIBUTE_BRAND_NAME)
+-                .orElse(BRAND_PURPUR_NAME), // Purpur
++                .orElse(ServerBrandConstants.BRAND_NAME), // Purpur // Plazma - Fork-friendly Rebranding
+             SharedConstants.getCurrentVersion().getId(),
+             SharedConstants.getCurrentVersion().getName(),
+             getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER)
+@@ -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
++        return brandId.equals(this.brandId) || SUPPORTED_BRANDS.contains(brandId); // Purpur // Plazma - Fork-friendly Rebranding
+     }
+ 
+     @Override
+diff --git a/src/main/java/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java
+index 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 ecaec3c7b5768771b00c4c33d48a76ba22653a79..8f77566bef4b992013e3b65068cabe7ee1921951 100644
+--- a/src/main/java/net/minecraft/server/Main.java
++++ b/src/main/java/net/minecraft/server/Main.java
+@@ -108,6 +108,11 @@ public class Main {
+             */ // CraftBukkit end
+ 
+         try {
++            // Plazma start - Fork-friendly Rebranding
++            //noinspection ConstantValue
++            if (io.papermc.paper.ServerBrandConstants.ASCII_LOGO != null)
++                System.out.println(io.papermc.paper.ServerBrandConstants.ASCII_LOGO);
++            // Plazma end - Fork-friendly Rebranding
+ 
+             Path path = (Path) optionset.valueOf("pidFile"); // CraftBukkit
+ 
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index 23505b0f80d643d9ef569b49192f44e0373dfb5f..20f79bcd7613e426b6b1020f586773819f1ac9d0 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -1280,7 +1280,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 7a442fb4cf78bcb1268359ee41a6de138edb76b6..193c62ed303d25558d78f1e8dfb655919335fdf6 100644
+--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -779,7 +779,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 4a96d914f8aa6f0c5f13fc85369a311f25835ac2..5b4285d6b37346bcea3bf072c6f00bd50c62e703 100644
+--- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
++++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+@@ -89,7 +89,7 @@ public class DamageSource {
+ 
+     public DamageSource customEventDamager(Entity entity) {
+         if (this.directEntity != null) {
+-            throw new IllegalStateException("Cannot set custom event damager when direct entity is already set (report a bug to Paper)");
++            throw new IllegalStateException("Cannot set custom event damager when direct entity is already set (report a bug to " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + ")"); // Plazma - Fork-friendly Rebranding
+         }
+         DamageSource damageSource = this.cloneInstance();
+         damageSource.customEventDamager = entity;
+diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
+index cf0f3a14584b9280211f88808cb1ddfb10105ec5..fffe0091008339d438961f0d9f6f62ad6d31859f 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
++        org.apache.logging.log4j.LogManager.getLogger().fatal(msg + " (" + file.toString().replaceAll(".+[\\\\/]", "") + " - " + x + "," + z + ") Go clean it up to remove this message. /minecraft:tp " + (x<<4)+" 128 "+(z<<4) + " - DO NOT REPORT THIS TO " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " - You may ask for help on Discord, but do not file an issue. These error messages can not be removed."); // Purpur // Plazma - Fork-friendly Rebranding
+     }
+ 
+     private static CompoundTag readOversizedChunk(RegionFile regionfile, ChunkPos chunkCoordinate) throws IOException {
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index 430407b0cf06ba337c59cd576c7e40a8e5fe8229..75a062e1105c2f7cc631a6b8b201b0e08621e3c5 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 5e7b833fc9f37bc370c76e5c43e6c9919d6d20af..ddbda1491e5873be1b54f0a555cc5c675f4597d4 100644
+--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
++++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+@@ -491,7 +491,7 @@ public class CraftScheduler implements BukkitScheduler {
+                 this.parsePending();
+             } else {
+                 // this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(this.currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper
+-                task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to Purpur"); // Paper // Purpur
++                task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to " + io.papermc.paper.ServerBrandConstants.BRAND_NAME); // Paper // Purpur // Plazma - Fork-friendly Rebranding
+                 // We don't need to parse pending
+                 // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
+             }
+diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
+index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..e0414f59b7c5ef149d8e52ebf76dc3e46d9de4d3 100644
+--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
++++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
+@@ -11,7 +11,7 @@ public final class Versioning {
+     public static String getBukkitVersion() {
+         String result = "Unknown-Version";
+ 
+-        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.purpurmc.purpur/purpur-api/pom.properties"); // Pufferfish // Purpur
++        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream(io.papermc.paper.ServerBrandConstants.RESOURCE_PATH); // Pufferfish // Purpur // Plazma - Fork-friendly Rebranding
+         Properties properties = new Properties();
+ 
+         if (stream != null) {
+@@ -20,7 +20,7 @@ public final class Versioning {
+ 
+                 result = properties.getProperty("version");
+             } catch (IOException ex) {
+-                Logger.getLogger(Versioning.class.getName()).log(Level.SEVERE, "Could not get Bukkit version!", ex);
++                Logger.getLogger(Versioning.class.getName()).log(Level.SEVERE, "Could not get " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " version!", ex); // Plazma - Fork-friendly Rebranding
+             }
+         }
+ 
+diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
+index f51cc3de3ca935ef90f7f0e9dd0506b856fc55f3..d889d964067058762fcffab9945fe586ce8d2a07 100644
+--- a/src/main/java/org/spigotmc/WatchdogThread.java
++++ b/src/main/java/org/spigotmc/WatchdogThread.java
+@@ -155,14 +155,14 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
+                 if (isLongTimeout) {
+                 // Paper end
+                 log.log( Level.SEVERE, "------------------------------" );
+-                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Purpur bug." ); // Paper // Purpur
++                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " bug." ); // Paper // Purpur // Plazma - Fork-friendly Rebranding
+                 log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" );
+                 log.log( Level.SEVERE, "\t *Especially* if it looks like HTTP or MySQL operations are occurring" );
+                 log.log( Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once" );
+                 log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" );
+-                log.log( Level.SEVERE, "If you are unsure or still think this is a Purpur bug, please report this to https://github.com/PurpurMC/Purpur/issues" ); // Purpur
++                log.log( Level.SEVERE, "If you are unsure or still think this is a " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " bug, please report this to " + io.papermc.paper.ServerBrandConstants.SUPPORT_PAGE ); // Purpur // Plazma - Fork-friendly Rebranding
+                 log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
+-                log.log( Level.SEVERE, "Purpur version: " + Bukkit.getServer().getVersion() ); // Purpur
++                log.log( Level.SEVERE,  io.papermc.paper.ServerBrandConstants.BRAND_NAME + " version: " + Bukkit.getServer().getVersion() ); // Purpur // Plazma - Fork-friendly Rebranding
+                 //
+                 if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
+                 {
+@@ -184,12 +184,12 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
+                 // Paper end
+                 } else
+                 {
+-                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PURPUR - THIS IS NOT A BUG OR A CRASH  - " + Bukkit.getServer().getVersion() + " ---"); // Purpur
++                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO " + io.papermc.paper.ServerBrandConstants.BRAND_NAME.toUpperCase() + " - THIS IS NOT A BUG OR A CRASH  - " + Bukkit.getServer().getVersion() + " ---"); // Purpur // Plazma - Fork-friendly Rebranding
+                     log.log(Level.SEVERE, "The server has not responded for " + (currentTime - lastTick) / 1000 + " seconds! Creating thread dump");
+                 }
+                 // Paper end - Different message for short timeout
+                 log.log( Level.SEVERE, "------------------------------" );
+-                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Purpur!):" ); // Paper // Purpur
++                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + "!):" ); // Paper // Purpur // Plazma - Fork-friendly Rebranding
+                 ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(MinecraftServer.getServer(), isLongTimeout); // Paper - rewrite chunk system
+                 this.dumpTickingInfo(); // Paper - log detailed tick information
+                 WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
+@@ -205,7 +205,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
+                     WatchdogThread.dumpThread( thread, log );
+                 }
+                 } else {
+-                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PURPUR - THIS IS NOT A BUG OR A CRASH ---"); // Purpur
++                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " - THIS IS NOT A BUG OR A CRASH ---"); // Purpur // Plazma - Fork-friendly Rebranding
+                 }
+ 
+                 log.log( Level.SEVERE, "------------------------------" );

patches/server/0005-Rebrand.patch

@@ -1,429 +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] Rebrand
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index be06b9b282c53bc135963447e19185d9ff41d19a..97b12b0b00bdf37ab122f8b8ea8b42ac65e30bce 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -13,12 +13,10 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
- val alsoShade: Configuration by configurations.creating
- 
- dependencies {
--    // Purpur start
--    implementation(project(":purpur-api"))
--    implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
--        exclude("io.papermc.paper", "paper-api")
--    }
--    // Purpur end
-+    // Plazma start - Branding
-+    implementation(project(":plazma-api"))
-+    implementation(project(":plazma-mojangapi"))
-+    // Plazma end - Branding
-     // Plazma start - Use Gradle version catalogs
-     /*
-     // Paper start
-@@ -118,7 +116,7 @@ tasks.jar {
-         attributes(
-             "Main-Class" to "org.bukkit.craftbukkit.Main",
-             "Implementation-Title" to "CraftBukkit",
--            "Implementation-Version" to "git-Purpur-$implementationVersion", // Pufferfish // Purpur
-+            "Implementation-Version" to "git-Plazma-$implementationVersion", // Pufferfish // Purpur // Plazma - Setup Gradle Project
-             "Implementation-Vendor" to date, // Paper
-             "Specification-Title" to "Bukkit",
-             "Specification-Version" to project.version,
-diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..0b3d87d2d43148e6370e7a03e0bb6074891ac800 100644
---- a/src/main/java/com/destroystokyo/paper/Metrics.java
-+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
-@@ -593,7 +593,7 @@ public class Metrics {
-             boolean logFailedRequests = config.getBoolean("logFailedRequests", false);
-             // Only start Metrics, if it's enabled in the config
-             if (config.getBoolean("enabled", true)) {
--                Metrics metrics = new Metrics("Purpur", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur
-+                Metrics metrics = new Metrics("Plazma", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur // Plazma - Branding
- 
-                 metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
-                     String minecraftVersion = Bukkit.getVersion();
-@@ -603,7 +603,7 @@ public class Metrics {
- 
-                 metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
-                 metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() ? "bungee" : "offline"))); // Purpur
--                metrics.addCustomChart(new Metrics.SimplePie("purpur_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // Purpur
-+                metrics.addCustomChart(new Metrics.SimplePie("plazma_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // Purpur // Plazma // Plazma - Branding
- 
-                 metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
-                     Map<String, Map<String, Integer>> map = new HashMap<>();
-diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..b04d3eea789f77b2435cb0192635f1be1bab597d 100644
---- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -20,10 +20,11 @@ import java.util.stream.StreamSupport;
- public class PaperVersionFetcher implements VersionFetcher {
-     private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end
-     // Purpur start
--    private static final String DOWNLOAD_PAGE = "https://purpurmc.org/downloads";
-+    private static final String DOWNLOAD_PAGE = "https://github.com/PlazmaMC/Plazma/releases"; // Plazma // Plazma - Branding
-     private static int distance = -2; public int distance() { return distance; }
-     // Purpur end
-     private static @Nullable String mcVer;
-+    private static final boolean DEVELOPMENT = false; // Plazma
- 
-     @Override
-     public long getCacheTime() {
-@@ -33,8 +34,8 @@ public class PaperVersionFetcher implements VersionFetcher {
-     @Nonnull
-     @Override
-     public Component getVersionMessage(@Nonnull String serverVersion) {
--        String[] parts = serverVersion.substring("git-Purpur-".length()).split("[-\\s]"); // Purpur
--        final Component updateMessage = getUpdateStatusMessage("PurpurMC/Purpur", "ver/" + getMinecraftVersion(), parts[0]); // Purpur
-+        String[] parts = serverVersion.substring("git-Plazma-".length()).split("[-\\s]"); // Purpur // Plazma // Plazma - Branding
-+        final Component updateMessage = getUpdateStatusMessage("PlazmaMC/PlazmaBukkit", (DEVELOPMENT ? "dev/" : "ver/") + getMinecraftVersion(), parts[0]); // Purpur // Plazma // Plazma - Branding
-         final Component history = getHistory();
- 
-         return history != null ? Component.join(net.kyori.adventure.text.JoinConfiguration.separator(Component.newline()), history, updateMessage) : updateMessage; // Purpur
-@@ -47,7 +48,7 @@ public class PaperVersionFetcher implements VersionFetcher {
-                 String result = matcher.group();
-                 mcVer = result.substring(0, result.length() - 2); // strip 'R' anchor and trailing '-'
-             } else {
--                org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to Purpur!"); // Purpur
-+                org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to Plazma!"); // Purpur // Plazma // Plazma - Branding
-                 org.bukkit.Bukkit.getLogger().warning("Pattern: " + VER_PATTERN.toString());
-                 org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
-             }
-@@ -57,6 +58,7 @@ public class PaperVersionFetcher implements VersionFetcher {
-     }
- 
-     private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
-+        /* // Plazma - Disable CI Checking
-         //int distance; // Purpur - use field
-         try {
-             int jenkinsBuild = Integer.parseInt(versionInfo);
-@@ -65,6 +67,11 @@ public class PaperVersionFetcher implements VersionFetcher {
-             versionInfo = versionInfo.replace("\"", "");
-             distance = fetchDistanceFromGitHub(repo, branch, versionInfo);
-         }
-+        // Plazma start - Disable CI Checking
-+         */
-+        versionInfo = versionInfo.replace("\"", ""); // Plazma
-+        distance = fetchDistanceFromGitHub(repo, branch, versionInfo); // Plazma
-+        // Plazma end - Disable CI Checking
- 
-         switch (distance) {
-             case -1:
-@@ -83,6 +90,7 @@ public class PaperVersionFetcher implements VersionFetcher {
-         }
-     }
- 
-+    /* // Plazma - Disable CI Checking
-     private static int fetchDistanceFromSiteApi(int jenkinsBuild, @Nullable String siteApiVersion) {
-         if (siteApiVersion == null) { return -1; }
-         try {
-@@ -102,6 +110,7 @@ public class PaperVersionFetcher implements VersionFetcher {
-             return -1;
-         }
-     }
-+     */ // Plazma - Disable CI Checking
- 
-     // Contributed by Techcable <Techcable@outlook.com> in GH-65
-     private static int fetchDistanceFromGitHub(@Nonnull String repo, @Nonnull String branch, @Nonnull 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 3cb56595822799926a8141e60a42f5d1edfc6de5..3e32c28e1d4c157a2f00dbc6d6e9d71cb3b8f6b7 100644
---- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-+++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-@@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
-     @Override
-     protected LineReader buildReader(LineReaderBuilder builder) {
-         builder
--                .appName("Purpur") // Purpur
-+                .appName("Plazma") // Purpur // Plazma - Branding
-                 .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/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
-index f91ea723a1c85f6cf8c4f6dd7f182b948c2f2e81..c5a3f9c2daf3da135cccecb757353534e1688821 100644
---- a/src/main/java/net/minecraft/CrashReport.java
-+++ b/src/main/java/net/minecraft/CrashReport.java
-@@ -37,7 +37,7 @@ public class CrashReport {
-         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("Plazma Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit // Plazma - Branding
-     }
- 
-     public String getTitle() {
-@@ -127,7 +127,7 @@ public class CrashReport {
-         stringbuilder.append("---- Minecraft Crash Report ----\n");
-         // Purpur start
-         stringbuilder.append("// ");
--        stringbuilder.append("// DO NOT REPORT THIS TO PAPER! REPORT TO PURPUR INSTEAD!");
-+        stringbuilder.append("// DO NOT REPORT THIS TO PAPER OR PURPUR! REPORT TO PLAZMA INSTEAD!"); // Plazma - Branding
-         // Purpur end
-         stringbuilder.append("// ");
-         stringbuilder.append(CrashReport.getErrorComment());
-diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index b4a009a1108758110181af3321a91b3ec9cf74dc..3e1079e9af85c62684ce19a7afaac5adc2167cb6 100644
---- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
-@@ -105,6 +105,18 @@ public class Main {
-             */ // CraftBukkit end
- 
-         try {
-+            // Plazma start - Branding
-+            System.out.println("""
-+                    \033[38;2;236;61;151m┏\033[38;2;236;61;157m━\033[38;2;237;62;163m━\033[38;2;237;62;169m━\033[38;2;238;62;175m━\033[38;2;238;63;181m━\033[38;2;239;63;187m┓\033[38;2;239;63;193m \033[38;2;239;64;200m┏\033[38;2;240;64;206m━\033[38;2;240;64;212m┓\033[38;2;241;65;218m \033[38;2;241;65;224m \033[38;2;242;65;230m \033[38;2;242;66;236m \033[38;2;242;66;242m \033[38;2;237;66;243m \033[38;2;232;67;243m┏\033[38;2;227;67;244m━\033[38;2;221;67;244m━\033[38;2;216;68;244m━\033[38;2;211;68;245m━\033[38;2;205;69;245m┓\033[38;2;200;69;246m \033[38;2;195;69;246m┏\033[38;2;189;70;246m━\033[38;2;184;70;247m━\033[38;2;179;70;247m━\033[38;2;173;71;247m━\033[38;2;168;71;248m━\033[38;2;163;72;248m━\033[38;2;157;72;249m┓\033[38;2;152;72;249m┏\033[38;2;147;73;249m━\033[38;2;141;73;250m━\033[38;2;136;74;250m┓\033[38;2;131;74;250m \033[38;2;125;74;251m \033[38;2;120;75;251m \033[38;2;115;75;251m┏\033[38;2;109;76;252m━\033[38;2;104;76;252m━\033[38;2;99;77;252m┓\033[38;2;94;77;253m \033[38;2;88;77;253m┏\033[38;2;83;78;253m━\033[38;2;78;79;254m━\033[38;2;79;85;254m━\033[38;2;79;91;254m━\033[38;2;80;97;255m┓\033[38;2;80;103;255m\s
-+                    \033[38;2;236;61;151m┃\033[38;2;236;61;157m┏\033[38;2;237;62;163m━\033[38;2;237;62;169m━\033[38;2;238;62;175m━\033[38;2;238;63;181m┓\033[38;2;239;63;187m┗\033[38;2;239;63;193m┓\033[38;2;239;64;200m┃\033[38;2;240;64;206m \033[38;2;240;64;212m┃\033[38;2;241;65;218m \033[38;2;241;65;224m \033[38;2;242;65;230m \033[38;2;242;66;236m \033[38;2;242;66;242m \033[38;2;237;66;243m┏\033[38;2;232;67;243m┛\033[38;2;227;67;244m┏\033[38;2;221;67;244m━\033[38;2;216;68;244m━\033[38;2;211;68;245m┓\033[38;2;205;69;245m┗\033[38;2;200;69;246m┓\033[38;2;195;69;246m┗\033[38;2;189;70;246m━\033[38;2;184;70;247m━\033[38;2;179;70;247m┓\033[38;2;173;71;247m \033[38;2;168;71;248m \033[38;2;163;72;248m┏\033[38;2;157;72;249m┛\033[38;2;152;72;249m┃\033[38;2;147;73;249m \033[38;2;141;73;250m \033[38;2;136;74;250m┗\033[38;2;131;74;250m┓\033[38;2;125;74;251m \033[38;2;120;75;251m┏\033[38;2;115;75;251m┛\033[38;2;109;76;252m \033[38;2;104;76;252m \033[38;2;99;77;252m┃\033[38;2;94;77;253m┏\033[38;2;88;77;253m┛\033[38;2;83;78;253m┏\033[38;2;78;79;254m━\033[38;2;79;85;254m━\033[38;2;79;91;254m┓\033[38;2;80;97;255m┗\033[38;2;80;103;255m┓
-+                    \033[38;2;236;61;151m┃\033[38;2;236;61;157m┗\033[38;2;237;62;163m━\033[38;2;237;62;169m━\033[38;2;238;62;175m━\033[38;2;238;63;181m┛\033[38;2;239;63;187m┏\033[38;2;239;63;193m┛\033[38;2;239;64;200m┃\033[38;2;240;64;206m \033[38;2;240;64;212m┃\033[38;2;241;65;218m \033[38;2;241;65;224m \033[38;2;242;65;230m \033[38;2;242;66;236m \033[38;2;242;66;242m \033[38;2;237;66;243m┃\033[38;2;232;67;243m \033[38;2;227;67;244m┗\033[38;2;221;67;244m━\033[38;2;216;68;244m━\033[38;2;211;68;245m┛\033[38;2;205;69;245m \033[38;2;200;69;246m┃\033[38;2;195;69;246m \033[38;2;189;70;246m \033[38;2;184;70;247m┏\033[38;2;179;70;247m┛\033[38;2;173;71;247m \033[38;2;168;71;248m┏\033[38;2;163;72;248m┛\033[38;2;157;72;249m \033[38;2;152;72;249m┃\033[38;2;147;73;249m \033[38;2;141;73;250m┏\033[38;2;136;74;250m┓\033[38;2;131;74;250m┗\033[38;2;125;74;251m━\033[38;2;120;75;251m┛\033[38;2;115;75;251m┏\033[38;2;109;76;252m┓\033[38;2;104;76;252m \033[38;2;99;77;252m┃\033[38;2;94;77;253m┃\033[38;2;88;77;253m \033[38;2;83;78;253m┗\033[38;2;78;79;254m━\033[38;2;79;85;254m━\033[38;2;79;91;254m┛\033[38;2;80;97;255m \033[38;2;80;103;255m┃
-+                    \033[38;2;236;61;151m┃\033[38;2;236;61;157m \033[38;2;237;62;163m┏\033[38;2;237;62;169m━\033[38;2;238;62;175m━\033[38;2;238;63;181m━\033[38;2;239;63;187m┛\033[38;2;239;63;193m \033[38;2;239;64;200m┃\033[38;2;240;64;206m \033[38;2;240;64;212m┃\033[38;2;241;65;218m \033[38;2;241;65;224m \033[38;2;242;65;230m \033[38;2;242;66;236m \033[38;2;242;66;242m \033[38;2;237;66;243m┃\033[38;2;232;67;243m \033[38;2;227;67;244m┏\033[38;2;221;67;244m━\033[38;2;216;68;244m━\033[38;2;211;68;245m┓\033[38;2;205;69;245m \033[38;2;200;69;246m┃\033[38;2;195;69;246m \033[38;2;189;70;246m┏\033[38;2;184;70;247m┛\033[38;2;179;70;247m \033[38;2;173;71;247m┏\033[38;2;168;71;248m┛\033[38;2;163;72;248m \033[38;2;157;72;249m \033[38;2;152;72;249m┃\033[38;2;147;73;249m \033[38;2;141;73;250m┃\033[38;2;136;74;250m┗\033[38;2;131;74;250m┓\033[38;2;125;74;251m \033[38;2;120;75;251m┏\033[38;2;115;75;251m┛\033[38;2;109;76;252m┃\033[38;2;104;76;252m \033[38;2;99;77;252m┃\033[38;2;94;77;253m┃\033[38;2;88;77;253m \033[38;2;83;78;253m┏\033[38;2;78;79;254m━\033[38;2;79;85;254m━\033[38;2;79;91;254m┓\033[38;2;80;97;255m \033[38;2;80;103;255m┃
-+                    \033[38;2;236;61;151m┃\033[38;2;236;61;157m \033[38;2;237;62;163m┃\033[38;2;237;62;169m \033[38;2;238;62;175m \033[38;2;238;63;181m \033[38;2;239;63;187m \033[38;2;239;63;193m \033[38;2;239;64;200m┃\033[38;2;240;64;206m \033[38;2;240;64;212m┗\033[38;2;241;65;218m━\033[38;2;241;65;224m━\033[38;2;242;65;230m━\033[38;2;242;66;236m━\033[38;2;242;66;242m┓\033[38;2;237;66;243m┃\033[38;2;232;67;243m \033[38;2;227;67;244m┃\033[38;2;221;67;244m \033[38;2;216;68;244m \033[38;2;211;68;245m┃\033[38;2;205;69;245m \033[38;2;200;69;246m┃\033[38;2;195;69;246m┏\033[38;2;189;70;246m┛\033[38;2;184;70;247m \033[38;2;179;70;247m \033[38;2;173;71;247m┗\033[38;2;168;71;248m━\033[38;2;163;72;248m━\033[38;2;157;72;249m┓\033[38;2;152;72;249m┃\033[38;2;147;73;249m \033[38;2;141;73;250m┃\033[38;2;136;74;250m \033[38;2;131;74;250m┗\033[38;2;125;74;251m━\033[38;2;120;75;251m┛\033[38;2;115;75;251m \033[38;2;109;76;252m┃\033[38;2;104;76;252m \033[38;2;99;77;252m┃\033[38;2;94;77;253m┃\033[38;2;88;77;253m \033[38;2;83;78;253m┃\033[38;2;78;79;254m \033[38;2;79;85;254m \033[38;2;79;91;254m┃\033[38;2;80;97;255m \033[38;2;80;103;255m┃
-+                    \033[38;2;236;61;151m┗\033[38;2;236;61;157m━\033[38;2;237;62;163m┛\033[38;2;237;62;169m \033[38;2;238;62;175m \033[38;2;238;63;181m \033[38;2;239;63;187m \033[38;2;239;63;193m \033[38;2;239;64;200m┗\033[38;2;240;64;206m━\033[38;2;240;64;212m━\033[38;2;241;65;218m━\033[38;2;241;65;224m━\033[38;2;242;65;230m━\033[38;2;242;66;236m━\033[38;2;242;66;242m┛\033[38;2;237;66;243m┗\033[38;2;232;67;243m━\033[38;2;227;67;244m┛\033[38;2;221;67;244m \033[38;2;216;68;244m \033[38;2;211;68;245m┗\033[38;2;205;69;245m━\033[38;2;200;69;246m┛\033[38;2;195;69;246m┗\033[38;2;189;70;246m━\033[38;2;184;70;247m━\033[38;2;179;70;247m━\033[38;2;173;71;247m━\033[38;2;168;71;248m━\033[38;2;163;72;248m━\033[38;2;157;72;249m┛\033[38;2;152;72;249m┗\033[38;2;147;73;249m━\033[38;2;141;73;250m┛\033[38;2;136;74;250m \033[38;2;131;74;250m \033[38;2;125;74;251m \033[38;2;120;75;251m \033[38;2;115;75;251m \033[38;2;109;76;252m┗\033[38;2;104;76;252m━\033[38;2;99;77;252m┛\033[38;2;94;77;253m┗\033[38;2;88;77;253m━\033[38;2;83;78;253m┛\033[38;2;78;79;254m \033[38;2;79;85;254m \033[38;2;79;91;254m┗\033[38;2;80;97;255m━\033[38;2;80;103;255m┛\033[0m
-+                    """);
-+            if (!org.plazmamc.plazma.Options.iKnowWhatIAmDoing)
-+                LOGGER.warn("Warning! Plazma may cause unexpected problems, so be sure to test it thoroughly before using it on a public server.");
-+            // Plazma end
-             // Paper start
-             if (Boolean.getBoolean("Paper.isRunDev")) {
-                 net.minecraft.server.packs.VanillaPackResourcesBuilder.developmentConfig = builder -> {
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b1dd8d66a524254a270a725f5f7a46f28e13b749..c7d748675b51ea69f31d87c74e4125a48a62ef48 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -956,7 +956,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         shutdownThread = Thread.currentThread();
-         org.spigotmc.WatchdogThread.doStop(); // Paper
-         if (!isSameThread()) {
--            MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PURPUR)"); // Purpur
-+            MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PLAZMA)"); // Purpur // Plazma - Branding
-             while (this.getRunningThread().isAlive()) {
-                 this.getRunningThread().stop();
-                 try {
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index ae75edfaa9e4c72f11fbb7ffc66294be47c206cc..a66dcea06424518290576c7647ae0717040586f9 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-@@ -57,7 +57,7 @@ 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 Plazma Server"); // Purpur // Plazma - Branding
-     public final boolean spawnAnimals = this.get("spawn-animals", true);
-     public final boolean spawnNpcs = this.get("spawn-npcs", true);
-     public final boolean pvp = this.get("pvp", true);
-diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
-index 7f07ffab0835d45d4d170fe171d7fa996d5913d9..a2b7441d1f5998f2b05903d07b587b42cc6ff987 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("Plazma Minecraft server"); // Purpur // Plazma - Branding
-         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("Plazma Minecraft server"); // Paper - Improve ServerGUI // Purpur // Plazma - Branding
- 
-         // 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("Plazma Minecraft server - shutting down!"); // Purpur // Plazma - Branding
-                     server.halt(true);
-                     servergui.runFinalizers();
-                 }
-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 fe312b1aef579cb4bf81bdd967cf72ff880d7505..97628761958289612ada0374f56e7d8f6af21512 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
-@@ -153,7 +153,7 @@ public class RegionFileStorage implements AutoCloseable {
- 
-     // 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 PAPER - You may ask for help on Discord, but do not file an issue. These error messages can not be removed.");
-+        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 PLAZMA - You may ask for help on Discord, but do not file an issue. These error messages can not be removed."); // Plazma - Branding
-     }
- 
-     private static CompoundTag readOversizedChunk(RegionFile regionfile, ChunkPos chunkCoordinate) throws IOException {
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0a5867b01c1ebf21d9add1d4a2843d15b8e1acb7..694dc50e8446754b56b8e214b04c773ab01f06fc 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -266,7 +266,7 @@ import javax.annotation.Nullable; // Paper
- import javax.annotation.Nonnull; // Paper
- 
- public final class CraftServer implements Server {
--    private final String serverName = "Purpur"; // Paper // Pufferfish // Purpur
-+    private final String serverName = "Plazma"; // Paper // Pufferfish // Purpur // Plazma - Branding
-     private final String serverVersion;
-     private final String bukkitVersion = Versioning.getBukkitVersion();
-     private final Logger logger = Logger.getLogger("Minecraft");
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 146f229b8e8888e2c0256c007c71c675c27e71a5..0f3ef5b27f72ba558765798d5f91d60bf5623029 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -141,7 +141,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 Plazma Version"); // Plazma - Branding
- 
-                 this.acceptsAll(Main.asList("demo"), "Demo mode");
- 
-@@ -192,7 +192,7 @@ public class Main {
-                 acceptsAll(asList("server-name"), "Name of the server")
-                         .withRequiredArg()
-                         .ofType(String.class)
--                        .defaultsTo("Unknown Server")
-+                        .defaultsTo("Plazma Server") // Plazma - Branding
-                         .describedAs("Name");
-                 // Paper end
-             }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index e3f724a19ab2f9821d84f9b03acf7c925c88f455..aeb862f55965d2a6dc138aa72f0aa9c9d8c8c79c 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -953,7 +953,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-             return EntityCategory.WATER;
-         }
- 
--        throw new UnsupportedOperationException("Unsupported monster type: " + type + ". This is a bug, report this to Purpur."); // Purpur
-+        throw new UnsupportedOperationException("Unsupported monster type: " + type + ". This is a bug, report this to Plazma."); // Purpur // Plazma - Branding
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index ca8ae8e1c51b937dac916e0b0dc94b5e2e61efeb..6bab5f9e40987d1a8ca9c17118d2a14135df5dff 100644
---- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -503,7 +503,7 @@ public class CraftScheduler implements BukkitScheduler {
-                 this.parsePending();
-             } else {
-                 // this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper
--                task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to Purpur"); // Paper // Purpur
-+                task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to Plazma"); // Paper // Purpur // Plazma - Branding
-                 // We don't need to parse pending
-                 // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
-             }
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..73b4818998098b08abcbee4d29915492aa09b5ef 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-@@ -8,22 +8,25 @@ import java.util.logging.Logger;
- import org.bukkit.Bukkit;
- 
- 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
-+    // Plazma start - Branding & Improve Versioning
-+    public static String version = "Unknown-Version";
-+    static {
-+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.plazmamc.plazma/plazma-api/pom.properties");
-         Properties properties = new Properties();
- 
-         if (stream != null) {
-             try {
-                 properties.load(stream);
- 
--                result = properties.getProperty("version");
-+                version = 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 Plazma version!", ex);
-             }
-         }
-+    }
- 
--        return result;
-+    public static String getBukkitVersion() {
-+        return version;
-     }
-+    // Plazma end - Branding & Improve Versioning
- }
-diff --git a/src/main/java/org/plazmamc/plazma/Options.java b/src/main/java/org/plazmamc/plazma/Options.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..a858b7ddef7f6877c0b92f4150e0dd37bea121aa
---- /dev/null
-+++ b/src/main/java/org/plazmamc/plazma/Options.java
-@@ -0,0 +1,7 @@
-+package org.plazmamc.plazma;
-+
-+public interface Options {
-+
-+    boolean iKnowWhatIAmDoing = Boolean.getBoolean("Plazma.iKnowWhatIAmDoing");
-+
-+}
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index efe25d3894f3ad000257c72d9a5e06ef22446d41..a937993f318ef5703420f57fe65c5d990ce2c4dd 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -231,7 +231,7 @@ public class PurpurConfig {
-         deathMessageOnlyBroadcastToAffectedPlayer = getBoolean("settings.broadcasts.death.only-broadcast-to-affected-player", deathMessageOnlyBroadcastToAffectedPlayer);
-     }
- 
--    public static String serverModName = "Purpur";
-+    public static String serverModName = "Plazma"; // Plazma - Branding
-     private static void serverModName() {
-         serverModName = getString("settings.server-mod-name", serverModName);
-     }
-diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index f7296691cb4af7814de1520347b307ff209082e4..090eb94fe8088d0ae98bfbe8bbd32a3cac2015d0 100644
---- a/src/main/java/org/spigotmc/WatchdogThread.java
-+++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -155,14 +155,14 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
-                 if (isLongTimeout) {
-                 // Paper end
-                 log.log( Level.SEVERE, "------------------------------" );
--                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Purpur bug." ); // Paper // Purpur
-+                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Plazma bug." ); // Paper // Purpur // Plazma - Branding
-                 log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" );
-                 log.log( Level.SEVERE, "\t *Especially* if it looks like HTTP or MySQL operations are occurring" );
-                 log.log( Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once" );
-                 log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" );
--                log.log( Level.SEVERE, "If you are unsure or still think this is a Purpur bug, please report this to https://github.com/PurpurMC/Purpur/issues" ); // Purpur
-+                log.log( Level.SEVERE, "If you are unsure or still think this is a Plazma bug, please report this to https://github.com/PlazmaMC/Plazma/issues" ); // Purpur // Plazma - Branding
-                 log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
--                log.log( Level.SEVERE, "Purpur version: " + Bukkit.getServer().getVersion() ); // Purpur
-+                log.log( Level.SEVERE, "Plazma version: " + Bukkit.getServer().getVersion() ); // Purpur // Plazma - Branding
-                 //
-                 if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
-                 {
-@@ -184,12 +184,12 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
-                 // Paper end
-                 } else
-                 {
--                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PURPUR - THIS IS NOT A BUG OR A CRASH  - " + Bukkit.getServer().getVersion() + " ---"); // Purpur
-+                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PLAZMA - THIS IS NOT A BUG OR A CRASH  - " + Bukkit.getServer().getVersion() + " ---"); // Purpur // Plazma - Branding
-                     log.log(Level.SEVERE, "The server has not responded for " + (currentTime - lastTick) / 1000 + " seconds! Creating thread dump");
-                 }
-                 // Paper end - Different message for short timeout
-                 log.log( Level.SEVERE, "------------------------------" );
--                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Purpur!):" ); // Paper // Purpur
-+                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Plazma!):" ); // Paper // Purpur // Plazma - Branding
-                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(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 final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
-                     WatchdogThread.dumpThread( thread, log );
-                 }
-                 } else {
--                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PURPUR - THIS IS NOT A BUG OR A CRASH ---"); // Purpur
-+                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PLAZMA - THIS IS NOT A BUG OR A CRASH ---"); // Purpur // Plazma - Branding
-                 }
- 
-                 log.log( Level.SEVERE, "------------------------------" );

patches/server/0007-Plazma-Configurations.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] Plazma Configurations
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java
-index c01b4393439838976965823298f12e4762e72eff..ca03933d30cb3a6243f6fa243af8dc62cba05050 100644
+index cda2ca940e30506807a5d12b84dbf69529051e26..150556ba594eae2214e4d1f0243ee97a7beb1e99 100644
 --- a/src/main/java/io/papermc/paper/configuration/Configurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/Configurations.java
-@@ -36,28 +36,93 @@ public abstract class Configurations<G, W> {
+@@ -37,27 +37,94 @@ public abstract class Configurations<G, W> {
      public static final String WORLD_DEFAULTS = "__world_defaults__";
-     public static final ResourceLocation WORLD_DEFAULTS_KEY = new ResourceLocation("configurations", WORLD_DEFAULTS);
+     public static final ResourceLocation WORLD_DEFAULTS_KEY = ResourceLocation.fromNamespaceAndPath("configurations", WORLD_DEFAULTS);
      protected final Path globalFolder;
 -    protected final Class<G> globalConfigClass;
 -    protected final Class<W> worldConfigClass;
@@ -26,6 +26,13 @@ index c01b4393439838976965823298f12e4762e72eff..ca03933d30cb3a6243f6fa243af8dc62
 -        final String defaultWorldConfigFileName,
 -        final String worldConfigFileName
 -    ) {
+-        this.globalFolder = globalFolder;
+-        this.globalConfigClass = globalConfigType;
+-        this.worldConfigClass = worldConfigClass;
+-        this.globalConfigFileName = globalConfigFileName;
+-        this.defaultWorldConfigFileName = defaultWorldConfigFileName;
+-        this.worldConfigFileName = worldConfigFileName;
++
 +    // Plazma start - Configurable Plazma
 +    @org.jetbrains.annotations.VisibleForTesting
 +    public static final java.util.function.Supplier<org.spigotmc.SpigotWorldConfig> SPIGOT_WORLD_DEFAULTS = com.google.common.base.Suppliers.memoize(() -> new org.spigotmc.SpigotWorldConfig(org.apache.commons.lang.RandomStringUtils.randomAlphabetic(255)) {
@@ -42,14 +49,9 @@ index c01b4393439838976965823298f12e4762e72eff..ca03933d30cb3a6243f6fa243af8dc62
 +        } catch (IOException e) {
 +            throw new RuntimeException("Could not setup configurations", e);
 +        }
-         this.globalFolder = globalFolder;
++        this.globalFolder = globalFolder; // Plazma - diff on changes
--        this.globalConfigClass = globalConfigType;
++    } // Plazma - diff on changes
--        this.worldConfigClass = worldConfigClass;
++
--        this.globalConfigFileName = globalConfigFileName;
--        this.defaultWorldConfigFileName = defaultWorldConfigFileName;
--        this.worldConfigFileName = worldConfigFileName;
-     }
- 
 +    protected abstract Class<G> globalConfigClass();
 +    protected abstract String globalConfigFileName();
 +    protected abstract org.spongepowered.configurate.NodePath[] removedGlobalPaths();
@@ -61,7 +63,7 @@ index c01b4393439838976965823298f12e4762e72eff..ca03933d30cb3a6243f6fa243af8dc62
 +    protected abstract org.spongepowered.configurate.NodePath[] removedWorldPaths();
 +    protected abstract W getWorldConfiguration(final ServerLevel level);
 +    protected abstract String buildWorldHeader(final ContextMap contextMap);
-+    protected abstract Object createWorldConfigInstance(final ContextMap contextMap);
++    protected abstract W createWorldConfigInstance(final ContextMap contextMap);
 +
 +    protected static ConfigurationOptions defaultOptions(ConfigurationOptions options) {
 +        return options.serializers(builder -> builder
@@ -76,16 +78,17 @@ index c01b4393439838976965823298f12e4762e72eff..ca03933d30cb3a6243f6fa243af8dc62
 +    }
 +
 +    protected static ContextMap createWorldContextMap(ServerLevel level) {
-+        return createWorldContextMap(level.convertable.levelDirectory.path(), level.serverLevelData.getLevelName(), level.dimension().location(), level.spigotConfig, level.registryAccess());
++        return createWorldContextMap(level.convertable.levelDirectory.path(), level.serverLevelData.getLevelName(), level.dimension().location(), level.spigotConfig, level.registryAccess(), level.getGameRules());
 +    }
 +
-+    public static ContextMap createWorldContextMap(Path dir, String levelName, ResourceLocation worldKey, org.spigotmc.SpigotWorldConfig spigotConfig, RegistryAccess registryAccess) {
++    public static ContextMap createWorldContextMap(Path dir, String levelName, ResourceLocation worldKey, org.spigotmc.SpigotWorldConfig spigotConfig, RegistryAccess registryAccess, GameRules gameRules) {
 +        return ContextMap.builder()
 +            .put(WORLD_DIRECTORY, dir)
 +            .put(WORLD_NAME, levelName)
 +            .put(WORLD_KEY, worldKey)
 +            .put(SPIGOT_WORLD_CONFIG_CONTEXT_KEY, com.google.common.base.Suppliers.ofInstance(spigotConfig))
 +            .put(REGISTRY_ACCESS, registryAccess)
++            .put(GAME_RULES, gameRules)
 +            .build();
 +    }
 +
@@ -115,13 +118,12 @@ index c01b4393439838976965823298f12e4762e72eff..ca03933d30cb3a6243f6fa243af8dc62
 +        } catch (Exception e) {
 +            throw new RuntimeException("Could not reload configuration files", e);
 +        }
-+    }
+     }
 +    // Plazma end - Configurable Plazma
-+
+ 
      protected ObjectMapper.Factory.Builder createObjectMapper() {
          return ObjectMapper.factoryBuilder()
-             .addConstraint(Constraint.class, new Constraint.Factory())
+@@ -66,17 +133,21 @@ public abstract class Configurations<G, W> {
-@@ -65,17 +130,21 @@ public abstract class Configurations<G, W> {
      }
  
      protected YamlConfigurationLoader.Builder createLoaderBuilder() {
@@ -146,7 +148,7 @@ index c01b4393439838976965823298f12e4762e72eff..ca03933d30cb3a6243f6fa243af8dc62
      }
  
      @MustBeInvokedByOverriders
-@@ -93,7 +162,7 @@ public abstract class Configurations<G, W> {
+@@ -94,7 +165,7 @@ public abstract class Configurations<G, W> {
          };
      }
  
@@ -155,7 +157,7 @@ index c01b4393439838976965823298f12e4762e72eff..ca03933d30cb3a6243f6fa243af8dc62
          return node -> {
              ObjectMapper.Factory factory = (ObjectMapper.Factory) Objects.requireNonNull(node.options().serializers().get(type));
              ObjectMapper.Mutable<T> mutable = (ObjectMapper.Mutable<T>) factory.get(type);
-@@ -103,7 +172,7 @@ public abstract class Configurations<G, W> {
+@@ -104,7 +175,7 @@ public abstract class Configurations<G, W> {
      }
  
      public G initializeGlobalConfiguration(final RegistryAccess registryAccess) throws ConfigurateException {
@@ -164,7 +166,7 @@ index c01b4393439838976965823298f12e4762e72eff..ca03933d30cb3a6243f6fa243af8dc62
      }
  
      private void trySaveFileNode(YamlConfigurationLoader loader, ConfigurationNode node, String filename) throws ConfigurateException {
-@@ -117,7 +186,7 @@ public abstract class Configurations<G, W> {
+@@ -118,7 +189,7 @@ public abstract class Configurations<G, W> {
      }
  
      protected G initializeGlobalConfiguration(final CheckedFunction<ConfigurationNode, G, SerializationException> creator) throws ConfigurateException {
@@ -173,7 +175,7 @@ index c01b4393439838976965823298f12e4762e72eff..ca03933d30cb3a6243f6fa243af8dc62
          final YamlConfigurationLoader loader = this.createGlobalLoaderBuilder()
              .defaultOptions(this.applyObjectMapperFactory(this.createGlobalObjectMapperFactoryBuilder().build()))
              .path(configFile)
-@@ -147,6 +216,13 @@ public abstract class Configurations<G, W> {
+@@ -149,6 +220,13 @@ public abstract class Configurations<G, W> {
      }
  
      protected void applyGlobalConfigTransformations(final ConfigurationNode node) throws ConfigurateException {
@@ -187,7 +189,7 @@ index c01b4393439838976965823298f12e4762e72eff..ca03933d30cb3a6243f6fa243af8dc62
      }
  
      @MustBeInvokedByOverriders
-@@ -154,6 +230,7 @@ public abstract class Configurations<G, W> {
+@@ -156,6 +234,7 @@ public abstract class Configurations<G, W> {
          return ContextMap.builder()
              .put(WORLD_NAME, WORLD_DEFAULTS)
              .put(WORLD_KEY, WORLD_DEFAULTS_KEY)
@@ -195,7 +197,7 @@ index c01b4393439838976965823298f12e4762e72eff..ca03933d30cb3a6243f6fa243af8dc62
              .put(REGISTRY_ACCESS, registryAccess);
      }
  
-@@ -161,7 +238,7 @@ public abstract class Configurations<G, W> {
+@@ -163,7 +242,7 @@ public abstract class Configurations<G, W> {
          final ContextMap contextMap = this.createDefaultContextMap(registryAccess)
              .put(FIRST_DEFAULT)
              .build();
@@ -204,40 +206,44 @@ index c01b4393439838976965823298f12e4762e72eff..ca03933d30cb3a6243f6fa243af8dc62
          final DefaultWorldLoader result = this.createDefaultWorldLoader(false, contextMap, configFile);
          final YamlConfigurationLoader loader = result.loader();
          final ConfigurationNode node = loader.load();
-@@ -171,8 +248,8 @@ public abstract class Configurations<G, W> {
+@@ -173,8 +252,8 @@ public abstract class Configurations<G, W> {
              this.verifyWorldConfigVersion(contextMap, node);
          }
-         this.applyWorldConfigTransformations(contextMap, node);
+         this.applyWorldConfigTransformations(contextMap, node, null);
 -        final W instance = node.require(this.worldConfigClass);
 -        node.set(this.worldConfigClass, instance);
 +        final W instance = node.require(this.worldConfigClass()); // Plazma - Configurable Plazma
 +        node.set(this.worldConfigClass(), instance); // Plazma - Configurable Plazma
-         trySaveFileNode(loader, node, configFile.toString());
+         this.trySaveFileNode(loader, node, configFile.toString());
      }
  
-@@ -193,30 +270,41 @@ public abstract class Configurations<G, W> {
+@@ -196,30 +275,45 @@ public abstract class Configurations<G, W> {
-     private record DefaultWorldLoader(YamlConfigurationLoader loader, boolean isNewFile) {
      }
  
-+    // Plazma start - Configurable Plazma
      protected ObjectMapper.Factory.Builder createWorldObjectMapperFactoryBuilder(final ContextMap contextMap) {
 -        return this.createObjectMapper();
++        // Plazma start - Configurable Plazma
 +        return this.createObjectMapper()
 +            .addNodeResolver(new io.papermc.paper.configuration.legacy.RequiresSpigotInitialization.Factory(contextMap.require(SPIGOT_WORLD_CONFIG_CONTEXT_KEY).get()))
 +            .addNodeResolver(new NestedSetting.Factory())
 +            .addDiscoverer(new io.papermc.paper.configuration.mapping.InnerClassFieldDiscoverer(Map.of(this.worldConfigClass(), createWorldConfigInstance(contextMap))));
++        // Plazma end - Configurable Plazma
      }
  
      @MustBeInvokedByOverriders
      protected YamlConfigurationLoader.Builder createWorldConfigLoaderBuilder(final ContextMap contextMap) {
 -        return this.createLoaderBuilder();
++        // Plazma start - Configurable Plazma
 +        return this.createLoaderBuilder().defaultOptions(options -> options
 +            .header(contextMap.require(WORLD_NAME).equals(WORLD_DEFAULTS) ? this.worldDefaultHeader() : this.buildWorldHeader(contextMap)));
++        // Plazma end - Configurable Plazma
      }
  
++    // Plazma start - Configurable Plazma
      // Make sure to run version transforms on the default world config first via #setupWorldDefaultsConfig
 -    public W createWorldConfig(final ContextMap contextMap) throws IOException {
 -        return this.createWorldConfig(contextMap, creator(this.worldConfigClass, false));
+-    }
 +    public W createWorldConfig(final ContextMap contextMap) {
 +        final String levelName = contextMap.require(WORLD_NAME);
 +        try {
@@ -245,10 +251,11 @@ index c01b4393439838976965823298f12e4762e72eff..ca03933d30cb3a6243f6fa243af8dc62
 +        } catch (IOException exception) {
 +            throw new RuntimeException("Could not create world config for " + levelName, exception);
 +        }
-     }
++    } // diff on change
 +    // Plazma end - Configurable Plazma
  
      protected W createWorldConfig(final ContextMap contextMap, final CheckedFunction<ConfigurationNode, W, SerializationException> creator) throws IOException {
+         Preconditions.checkArgument(!contextMap.isDefaultWorldContext(), "cannot create world map with default world context");
 -        final Path defaultsConfigFile = this.globalFolder.resolve(this.defaultWorldConfigFileName);
 +        final Path defaultsConfigFile = this.globalFolder.resolve(this.defaultWorldConfigFileName()); // Plazma - Configurable Plazma
          final YamlConfigurationLoader defaultsLoader = this.createDefaultWorldLoader(true, this.createDefaultContextMap(contextMap.require(REGISTRY_ACCESS)).build(), defaultsConfigFile).loader();
@@ -264,19 +271,10 @@ index c01b4393439838976965823298f12e4762e72eff..ca03933d30cb3a6243f6fa243af8dc62
              Files.createFile(worldConfigFile); // create empty file as template
              newFile = true;
          }
-@@ -245,7 +333,7 @@ public abstract class Configurations<G, W> {
+@@ -263,6 +357,13 @@ public abstract class Configurations<G, W> {
-             if (worldName.equals(WORLD_DEFAULTS)) {
-                 LOGGER.warn("The world defaults config file didn't have a version set, assuming latest");
-             } else {
--                LOGGER.warn("The world config file for " + worldName + " didn't have a version set, assuming latest");
-+                LOGGER.warn("The world config file for {} didn't have a version set, assuming latest", worldName); // Plazma
-             }
-             version.raw(this.worldConfigVersion());
-         } else if (version.getInt() > this.worldConfigVersion()) {
-@@ -260,6 +348,13 @@ public abstract class Configurations<G, W> {
      }
  
-     protected void applyWorldConfigTransformations(final ContextMap contextMap, final ConfigurationNode node) throws ConfigurateException {
+     protected void applyWorldConfigTransformations(final ContextMap contextMap, final ConfigurationNode node, final @Nullable ConfigurationNode defaultsNode) throws ConfigurateException {
 +        // Plazma start - Configurable Plazma
 +        org.spongepowered.configurate.transformation.ConfigurationTransformation.Builder builder = org.spongepowered.configurate.transformation.ConfigurationTransformation.builder();
 +        for (org.spongepowered.configurate.NodePath path : removedWorldPaths()) {
@@ -287,7 +285,7 @@ index c01b4393439838976965823298f12e4762e72eff..ca03933d30cb3a6243f6fa243af8dc62
      }
  
      protected void applyDefaultsAwareWorldConfigTransformations(final ContextMap contextMap, final ConfigurationNode worldNode, final ConfigurationNode defaultsNode) throws ConfigurateException {
-@@ -272,7 +367,7 @@ public abstract class Configurations<G, W> {
+@@ -275,7 +376,7 @@ public abstract class Configurations<G, W> {
      }
  
      public Path getWorldConfigFile(ServerLevel level) {
@@ -297,10 +295,10 @@ index c01b4393439838976965823298f12e4762e72eff..ca03933d30cb3a6243f6fa243af8dc62
  
      public static class ContextMap {
 diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-index fa1c0aee8c3a4d0868482cf5c703bbfd08e09874..4a444ac90d357e1b5cc432bccad958054b8a8665 100644
+index 47a2cba0db36b11548d06ec21f7c7d7c9a962d6e..3f99ca451099d2c7baf12b7b603d8b30f520734c 100644
 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-@@ -131,6 +131,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -137,6 +137,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
          See https://docs.papermc.io/paper/configuration for more information.
          """;
  
@@ -308,16 +306,14 @@ index fa1c0aee8c3a4d0868482cf5c703bbfd08e09874..4a444ac90d357e1b5cc432bccad95805
      @VisibleForTesting
      public static final Supplier<SpigotWorldConfig> SPIGOT_WORLD_DEFAULTS = Suppliers.memoize(() -> new SpigotWorldConfig(RandomStringUtils.randomAlphabetic(255)) {
          @Override // override to ensure "verbose" is false
-@@ -139,12 +140,69 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -145,11 +146,68 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
          }
      });
      public static final ContextKey<Supplier<SpigotWorldConfig>> SPIGOT_WORLD_CONFIG_CONTEXT_KEY = new ContextKey<>(new TypeToken<Supplier<SpigotWorldConfig>>() {}, "spigot world config");
--
++     */ // Plazma - Configurable Plazma
-+    // Plazma start - Configurable Plazma
-+     */
  
-     public PaperConfigurations(final Path globalFolder) {
++    // Plazma start - Configurable Plazma
--        super(globalFolder, GlobalConfiguration.class, WorldConfiguration.class, GLOBAL_CONFIG_FILE_NAME, WORLD_DEFAULTS_CONFIG_FILE_NAME, WORLD_CONFIG_FILE_NAME);
++    public PaperConfigurations(final Path globalFolder) { // diff on change
 +        super(globalFolder);
 +    }
 +
@@ -334,8 +330,8 @@ index fa1c0aee8c3a4d0868482cf5c703bbfd08e09874..4a444ac90d357e1b5cc432bccad95805
 +    @Override
 +    protected NodePath[] removedGlobalPaths() {
 +        return RemovedConfigurations.REMOVED_GLOBAL_PATHS;
-     }
++    }
- 
++
 +    @Override
 +    protected GlobalConfiguration getGlobalConfiguration() {
 +        return GlobalConfiguration.get();
@@ -365,30 +361,48 @@ index fa1c0aee8c3a4d0868482cf5c703bbfd08e09874..4a444ac90d357e1b5cc432bccad95805
 +    protected String worldDefaultHeader() {
 +        return WORLD_DEFAULTS_HEADER;
 +    }
-+
+ 
+-    public PaperConfigurations(final Path globalFolder) {
+-        super(globalFolder, GlobalConfiguration.class, WorldConfiguration.class, GLOBAL_CONFIG_FILE_NAME, WORLD_DEFAULTS_CONFIG_FILE_NAME, WORLD_CONFIG_FILE_NAME);
 +    @Override
 +    protected String buildWorldHeader(final ContextMap contextMap) {
 +        return WORLD_HEADER.apply(contextMap);
-+    }
++     }
-+
++ 
 +    @Override
 +    protected WorldConfiguration getWorldConfiguration(final ServerLevel level) {
 +        return level.paperConfig();
-+    }
+     }
 +    // Plazma end - Configurable Plazma
-+
+ 
      @Override
      protected int globalConfigVersion() {
-         return GlobalConfiguration.CURRENT_VERSION;
+@@ -164,14 +222,11 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
-@@ -155,6 +213,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+     @Override
-         return WorldConfiguration.CURRENT_VERSION;
+     protected YamlConfigurationLoader.Builder createLoaderBuilder() {
+         return super.createLoaderBuilder()
+-            .defaultOptions(PaperConfigurations::defaultOptions);
++            .defaultOptions(PaperConfigurations::defaultOptions0); // Plazma - Configurable Plazma
+     }
+ 
+-    private static ConfigurationOptions defaultOptions(ConfigurationOptions options) {
++    private static ConfigurationOptions defaultOptions0(ConfigurationOptions options) { // Plazma - Configurable Plazma
+         return options.serializers(builder -> builder
+-            .register(MapSerializer.TYPE, new MapSerializer(false))
+-            .register(new EnumValueSerializer())
+-            .register(new ComponentSerializer())
+             .register(IntOr.Default.SERIALIZER)
+             .register(IntOr.Disabled.SERIALIZER)
+             .register(DoubleOr.Default.SERIALIZER)
+@@ -183,6 +238,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+         );
      }
  
 +    /* // Plazma - Configurable Plazma
      @Override
-     protected YamlConfigurationLoader.Builder createLoaderBuilder() {
+     protected ObjectMapper.Factory.Builder createGlobalObjectMapperFactoryBuilder() {
-         return super.createLoaderBuilder()
+         return defaultGlobalFactoryBuilder(super.createGlobalObjectMapperFactoryBuilder());
-@@ -177,6 +236,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -191,6 +247,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
      private static ObjectMapper.Factory.Builder defaultGlobalFactoryBuilder(ObjectMapper.Factory.Builder builder) {
          return builder.addDiscoverer(InnerClassFieldDiscoverer.globalConfig());
      }
@@ -396,7 +410,7 @@ index fa1c0aee8c3a4d0868482cf5c703bbfd08e09874..4a444ac90d357e1b5cc432bccad95805
  
      @Override
      protected YamlConfigurationLoader.Builder createGlobalLoaderBuilder() {
-@@ -200,6 +260,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -213,6 +270,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
          return configuration;
      }
  
@@ -404,42 +418,41 @@ index fa1c0aee8c3a4d0868482cf5c703bbfd08e09874..4a444ac90d357e1b5cc432bccad95805
      @Override
      protected ContextMap.Builder createDefaultContextMap(final RegistryAccess registryAccess) {
          return super.createDefaultContextMap(registryAccess)
-@@ -213,8 +274,12 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -226,8 +284,9 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
              .addNodeResolver(new NestedSetting.Factory())
              .addDiscoverer(InnerClassFieldDiscoverer.worldConfig(createWorldConfigInstance(contextMap)));
      }
-+    // Plazma start - Configurable Plazma
++     */ // Plazma - Configurable Plazma
-+     */
  
 -    private static WorldConfiguration createWorldConfigInstance(ContextMap contextMap) {
-+    @Override
++    @Override protected WorldConfiguration createWorldConfigInstance(ContextMap contextMap) { // Plazma - Configurable Plazma
-+    protected Object createWorldConfigInstance(ContextMap contextMap) {
-+    // Plazma end - Configurable Plazma
          return new WorldConfiguration(
              contextMap.require(PaperConfigurations.SPIGOT_WORLD_CONFIG_CONTEXT_KEY).get(),
              contextMap.require(Configurations.WORLD_KEY)
-@@ -226,7 +291,6 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -239,7 +298,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
          final RegistryAccess access = contextMap.require(REGISTRY_ACCESS);
          return super.createWorldConfigLoaderBuilder(contextMap)
              .defaultOptions(options -> options
 -                .header(contextMap.require(WORLD_NAME).equals(WORLD_DEFAULTS) ? WORLD_DEFAULTS_HEADER : WORLD_HEADER.apply(contextMap))
++                // .header(contextMap.require(WORLD_NAME).equals(WORLD_DEFAULTS) ? WORLD_DEFAULTS_HEADER : WORLD_HEADER.apply(contextMap)) // Plazma - Configurable Plazma
                  .serializers(serializers -> serializers
                      .register(new TypeToken<Reference2IntMap<?>>() {}, new FastutilMapSerializer.SomethingToPrimitive<Reference2IntMap<?>>(Reference2IntOpenHashMap::new, Integer.TYPE))
                      .register(new TypeToken<Reference2LongMap<?>>() {}, new FastutilMapSerializer.SomethingToPrimitive<Reference2LongMap<?>>(Reference2LongOpenHashMap::new, Long.TYPE))
-@@ -251,11 +315,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -259,12 +318,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
  
      @Override
-     protected void applyWorldConfigTransformations(final ContextMap contextMap, final ConfigurationNode node) throws ConfigurateException {
+     protected void applyWorldConfigTransformations(final ContextMap contextMap, final ConfigurationNode node, final @Nullable ConfigurationNode defaultsNode) throws ConfigurateException {
--        ConfigurationTransformation.Builder builder = ConfigurationTransformation.builder();
+-        final ConfigurationTransformation.Builder builder = ConfigurationTransformation.builder();
--        for (NodePath path : RemovedConfigurations.REMOVED_WORLD_PATHS) {
+-        for (final NodePath path : RemovedConfigurations.REMOVED_WORLD_PATHS) {
 -            builder.addAction(path, TransformAction.remove());
 -        }
+-        org.purpurmc.purpur.configuration.transformation.VoidDamageHeightMigration.apply(builder, contextMap); // Purpur
 -        builder.build().apply(node);
-+        super.applyWorldConfigTransformations(contextMap, node); // Plazma - Configurable Plazma
++        super.applyWorldConfigTransformations(contextMap, node, defaultsNode); // Plazma - Configurable Plazma
  
          final ConfigurationTransformation.VersionedBuilder versionedBuilder = Transformations.versionedBuilder();
          V29_ZeroWorldHeight.apply(versionedBuilder);
-@@ -266,11 +326,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -276,11 +330,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
  
      @Override
      protected void applyGlobalConfigTransformations(ConfigurationNode node) throws ConfigurateException {
@@ -452,23 +465,23 @@ index fa1c0aee8c3a4d0868482cf5c703bbfd08e09874..4a444ac90d357e1b5cc432bccad95805
  
          final ConfigurationTransformation.VersionedBuilder versionedBuilder = Transformations.versionedBuilder();
          V29_LogIPs.apply(versionedBuilder);
-@@ -295,6 +351,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -300,6 +350,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
-         transformation.apply(worldNode);
+         builder.build().apply(worldNode);
      }
  
 +    /* // Plazma - Configurable Plazma
      @Override
      public WorldConfiguration createWorldConfig(final ContextMap contextMap) {
          final String levelName = contextMap.require(WORLD_NAME);
-@@ -335,6 +392,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -341,6 +392,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
-             .put(REGISTRY_ACCESS, registryAccess)
+             .put(GAME_RULES, gameRules)
              .build();
      }
 +     */ // Plazma - Configurable Plazma
  
      public static PaperConfigurations setup(final Path legacyConfig, final Path configDir, final Path worldFolder, final File spigotConfig) throws Exception {
          final Path legacy = Files.isSymbolicLink(legacyConfig) ? Files.readSymbolicLink(legacyConfig) : legacyConfig;
-@@ -368,12 +426,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -374,12 +426,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
                  throw new RuntimeException("Could not convert '" + legacyFileName + "' to the new configuration format", ex);
              }
          }
@@ -482,7 +495,7 @@ index fa1c0aee8c3a4d0868482cf5c703bbfd08e09874..4a444ac90d357e1b5cc432bccad95805
      }
  
      private static void convert(final Path legacyConfig, final Path configDir, final Path worldFolder, final File spigotConfig) throws Exception {
-@@ -424,6 +477,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -430,6 +477,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
          return Files.exists(legacyConfig) && Files.isRegularFile(legacyConfig);
      }
  
@@ -490,7 +503,7 @@ index fa1c0aee8c3a4d0868482cf5c703bbfd08e09874..4a444ac90d357e1b5cc432bccad95805
      @Deprecated
      public YamlConfiguration createLegacyObject(final MinecraftServer server) {
          YamlConfiguration global = YamlConfiguration.loadConfiguration(this.globalFolder.resolve(this.globalConfigFileName).toFile());
-@@ -434,6 +488,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -440,6 +488,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
          }
          return global;
      }
@@ -498,7 +511,7 @@ index fa1c0aee8c3a4d0868482cf5c703bbfd08e09874..4a444ac90d357e1b5cc432bccad95805
  
      @Deprecated
      public static YamlConfiguration loadLegacyConfigFile(File configFile) throws Exception {
-@@ -456,10 +511,12 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -462,10 +511,13 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
          return BasicConfigurationNode.root(options);
      }
  
@@ -510,20 +523,21 @@ index fa1c0aee8c3a4d0868482cf5c703bbfd08e09874..4a444ac90d357e1b5cc432bccad95805
          }
      }
 +     */ // Plazma - Configurable Plazma
++
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c7d748675b51ea69f31d87c74e4125a48a62ef48..c81695902775f345d77154ea309bb71d34d08175 100644
+index 20f79bcd7613e426b6b1020f586773819f1ac9d0..20266ef8f0974f47581e71175de4b01ea1a27bf0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -307,6 +307,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -328,6 +328,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public final double[] recentTps = new double[ 4 ]; // Purpur
      // Spigot end
      public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
 +    public final org.plazmamc.plazma.configurations.PlazmaConfigurations plazmaConfigurations; // Plazma - Configurable Plazma
-     public static long currentTickLong = 0L; // Paper - track current tick as a long
      public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
      public boolean lagging = false; // Purpur
-@@ -416,6 +417,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     protected boolean upnp = false; // Purpur
+@@ -515,6 +516,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
          // CraftBukkit end
          this.paperConfigurations = services.paperConfigurations(); // Paper - add paper configuration files
@@ -531,112 +545,121 @@ index c7d748675b51ea69f31d87c74e4125a48a62ef48..c81695902775f345d77154ea309bb71d
      }
  
      private void readScoreboard(DimensionDataStorage persistentStateManager) {
-@@ -1461,6 +1463,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     }
-     // Paper end - execute chunk tasks mid tick
- 
-+    // Plazma start - Configurable Plazma
-+    public static void setServer(MinecraftServer server) {
-+        if (SERVER != null)
-+            throw new UnsupportedOperationException("Cannot redefine singleton Server");
-+
-+        SERVER = server;
-+    }
-+    // Plazma end - Configurable Plazma
-+
-     private boolean pollTaskInternal() {
-         if (super.pollTask()) {
-             this.executeMidTickTasks(); // Paper - execute chunk tasks mid tick
 diff --git a/src/main/java/net/minecraft/server/Services.java b/src/main/java/net/minecraft/server/Services.java
-index d89c624554ab08bd1b33a3f62b52aa57aaafb8b4..a060580a8edc6b847525ec1c0ba91414e46e5a7b 100644
+index 33e3815a0c979609d4c7ab83ad91e87ac07a556d..4f1071c48fec78036d6759cdff179df3182f28f5 100644
 --- a/src/main/java/net/minecraft/server/Services.java
 +++ b/src/main/java/net/minecraft/server/Services.java
-@@ -11,11 +11,18 @@ import net.minecraft.server.players.GameProfileCache;
+@@ -12,13 +12,34 @@ import net.minecraft.util.SignatureValidator;
- import net.minecraft.util.SignatureValidator;
  
- // Paper start - add paper configuration files
--public record Services(MinecraftSessionService sessionService, ServicesKeySet servicesKeySet, GameProfileRepository profileRepository, GameProfileCache profileCache, @javax.annotation.Nullable io.papermc.paper.configuration.PaperConfigurations paperConfigurations) {
-+public record Services(MinecraftSessionService sessionService, ServicesKeySet servicesKeySet, GameProfileRepository profileRepository, GameProfileCache profileCache, @org.jetbrains.annotations.Nullable io.papermc.paper.configuration.PaperConfigurations paperConfigurations, @org.jetbrains.annotations.Nullable org.plazmamc.plazma.configurations.PlazmaConfigurations plazmaConfigurations) { // Plazma - Configurable Plazma
  
+ public record Services(
+-    MinecraftSessionService sessionService, ServicesKeySet servicesKeySet, GameProfileRepository profileRepository, GameProfileCache profileCache, @javax.annotation.Nullable io.papermc.paper.configuration.PaperConfigurations paperConfigurations // Paper - add paper configuration files
++    // Plazma start - Configurable Plazma
++    MinecraftSessionService sessionService,
++    ServicesKeySet servicesKeySet,
++    GameProfileRepository profileRepository,
++    GameProfileCache profileCache,
++    @org.jetbrains.annotations.Nullable io.papermc.paper.configuration.PaperConfigurations paperConfigurations,
++    @org.jetbrains.annotations.Nullable org.plazmamc.plazma.configurations.PlazmaConfigurations plazmaConfigurations
++    // Plazma end - Configurable Plazma
+ ) {
+     // Paper start - add paper configuration files
++    // Plazma start - Configurable Plazma
      public Services(MinecraftSessionService sessionService, ServicesKeySet servicesKeySet, GameProfileRepository profileRepository, GameProfileCache profileCache) {
 -        this(sessionService, servicesKeySet, profileRepository, profileCache, null);
-+        this(sessionService, servicesKeySet, profileRepository, profileCache, null, null); // Plazma - Configurable Plazma
++        this(
++            sessionService,
++            servicesKeySet,
++            profileRepository,
++            profileCache,
++            null,
++            null
++        );
      }
-+    
+ 
-+    // Plazma start - Configurable Plazma
 +    @Override
 +    public org.plazmamc.plazma.configurations.PlazmaConfigurations plazmaConfigurations() {
 +        return java.util.Objects.requireNonNull(this.plazmaConfigurations);
 +    }
 +    // Plazma end - Configurable Plazma
- 
++
      @Override
      public io.papermc.paper.configuration.PaperConfigurations paperConfigurations() {
-@@ -32,7 +39,11 @@ public record Services(MinecraftSessionService sessionService, ServicesKeySet se
+         return java.util.Objects.requireNonNull(this.paperConfigurations);
+@@ -34,7 +55,16 @@ public record Services(
          final java.nio.file.Path legacyConfigPath = ((File) optionSet.valueOf("paper-settings")).toPath();
          final java.nio.file.Path configDirPath = ((File) optionSet.valueOf("paper-settings-directory")).toPath();
          io.papermc.paper.configuration.PaperConfigurations paperConfigurations = io.papermc.paper.configuration.PaperConfigurations.setup(legacyConfigPath, configDirPath, rootDirectory.toPath(), (File) optionSet.valueOf("spigot-settings"));
 -        return new Services(minecraftSessionService, authenticationService.getServicesKeySet(), gameProfileRepository, gameProfileCache, paperConfigurations);
 +        // Plazma start - Configurable Plazma
-+        final java.nio.file.Path plazmaConfigDirPath = ((File) optionSet.valueOf("plazma-settings-directory")).toPath();
++        return new Services(
-+        org.plazmamc.plazma.configurations.PlazmaConfigurations plazmaConfigurations = new org.plazmamc.plazma.configurations.PlazmaConfigurations(plazmaConfigDirPath);
++            minecraftSessionService,
-+        return new Services(minecraftSessionService, authenticationService.getServicesKeySet(), gameProfileRepository, gameProfileCache, paperConfigurations, plazmaConfigurations);
++            authenticationService.getServicesKeySet(),
-+        // Plazma end - Configurable Plazma
++            gameProfileRepository,
++            gameProfileCache,
++            paperConfigurations,
++            new org.plazmamc.plazma.configurations.PlazmaConfigurations(optionSet)
++        );
++        // Plazma end
          // Paper end - load paper config files from cli options
      }
  
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 5ca6af93362d205438f8321ee2461ae7f8160df1..b7709cbb1a78eb1daac2112cb9fbf5d379aaa662 100644
+index 193c62ed303d25558d78f1e8dfb655919335fdf6..d4a9b187b01c63342d9b05b5c29bb1d199deed6c 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -209,6 +209,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -232,6 +232,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          // Paper start - initialize global and world-defaults configuration
          this.paperConfigurations.initializeGlobalConfiguration(this.registryAccess());
          this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
 +        this.plazmaConfigurations.initializeGlobalConfiguration(this.registryAccess()); // Plazma - Configurable Plazma
 +        this.plazmaConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess()); // Plazma - Configurable Plazma
          // Paper end - initialize global and world-defaults configuration
+         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()) {
+@@ -243,6 +245,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-@@ -219,6 +221,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash); // Paper - start watchdog thread
          thread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized
          io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
 +        org.plazmamc.plazma.commands.Commands.register(this); // Plazma - Configurable Plazma
+         this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
-         // Purpur start
+         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
-         try {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index fb6b762bac4d36b2e307b5343988884fa339d001..08a5afa3b0f9729bc0883054e2255dee4d9ed815 100644
+index 6a359f1ed07aa7b9c78e470fb00661ea03eaec03..a4421517b8136bb974e197eaa6dd0d83c2fdd0de 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -695,7 +695,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -600,7 +600,24 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
-         // Holder holder = worlddimension.type(); // CraftBukkit - decompile error
  
-         // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
+     // Add env and gen to constructor, IWorldDataServer -> WorldDataServer
--        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess())), executor); // Paper - create paper world configs; Async-Anti-Xray: Pass executor
+     public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey<Level> resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List<CustomSpawner> list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
-+        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess())), spigotConfig -> minecraftserver.plazmaConfigurations.createWorldConfig(org.plazmamc.plazma.configurations.PlazmaConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess())), executor); // Paper - create paper world configs; Async-Anti-Xray: Pass executor // Plazma - Configurable Plazma
+-        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess(), iworlddataserver.getGameRules())), executor); // Paper - create paper world configs; Async-Anti-Xray: Pass executor
++        // Plazma start - Configurable Plazma
++        super(
++            iworlddataserver,
++            resourcekey,
++            minecraftserver.registryAccess(),
++            worlddimension.type(),
++            false,
++            flag,
++            i,
++            minecraftserver.getMaxChainedNeighborUpdates(),
++            gen,
++            biomeProvider,
++            env,
++            spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess(), iworlddataserver.getGameRules())),
++            spigotConfig -> minecraftserver.plazmaConfigurations.createWorldConfig(org.plazmamc.plazma.configurations.PlazmaConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess(), iworlddataserver.getGameRules())),
++            executor
++        );
++        // Plazma end - Configurable Plazma
          this.pvpMode = minecraftserver.isPvpAllowed();
          this.convertable = convertable_conversionsession;
          this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
-diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index f6664447c45b1d6f3371af7bed8b1175b17f25e2..9161f020d2ecc0cb9191666cfbc6a877d067063e 100644
---- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -271,7 +271,7 @@ public final class ItemStack {
-         if (0 < version && version < CraftMagicNumbers.INSTANCE.getDataVersion() && MinecraftServer.getServer() != null) { // Paper - skip conversion if the server doesn't exist (for tests)
-             CompoundTag savedStack = new CompoundTag();
-             this.save(savedStack);
--            savedStack = (CompoundTag) MinecraftServer.getServer().fixerUpper.update(References.ITEM_STACK, new Dynamic(NbtOps.INSTANCE, savedStack), version, CraftMagicNumbers.INSTANCE.getDataVersion()).getValue();
-+            savedStack = (CompoundTag) MinecraftServer.getServer().getFixerUpper().update(References.ITEM_STACK, new Dynamic(NbtOps.INSTANCE, savedStack), version, CraftMagicNumbers.INSTANCE.getDataVersion()).getValue(); // Plazma - Configurable Plazma
-             this.load(savedStack);
-         }
-     }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 67a26f22d4eb7eaeee7900e6f4de421d0bfd5612..c4bfdf19651a3c8ef66795a6c7f5a29c72f9ee2d 100644
+index f8575f94a389d87d8043ae838720dbe2247235c4..0da2014933fe441c4d3dc27c5fe10afa92ca1ec7 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -171,7 +171,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -172,7 +172,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
          return this.paperConfig;
      }
      // Paper end - add paper world config
@@ -649,13 +672,35 @@ index 67a26f22d4eb7eaeee7900e6f4de421d0bfd5612..c4bfdf19651a3c8ef66795a6c7f5a29c
 +    // Plazma end - Configurable Plazma
      public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
      public final org.purpurmc.purpur.PurpurWorldConfig purpurConfig; // Purpur
-     public final co.aikar.timings.WorldTimingsHandler timings; // Paper
+     public static BlockPos lastPhysicsProblem; // Spigot
-@@ -253,9 +258,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -874,7 +879,24 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+     }
+     // Paper end - optimise random ticking
  
-     //protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(java.util.concurrent.ThreadLocalRandom.current().nextLong()); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter // Purpur - dont break ABI
+-    protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - create paper world config & Anti-Xray
- 
++    // Plazma start - Configurable Plazma
--    protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - create paper world config; Async-Anti-Xray: Pass executor
++    protected Level(
-+    protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.function.Function<org.spigotmc.SpigotWorldConfig, org.plazmamc.plazma.configurations.WorldConfigurations> plazmaWorldConfigurationCreator, java.util.concurrent.Executor executor) { // Paper - create paper world config; Async-Anti-Xray: Pass executor // Plazma - Configurable Plazma
++        WritableLevelData worlddatamutable,
++        ResourceKey<Level> resourcekey,
++        RegistryAccess iregistrycustom,
++        Holder<DimensionType> holder,
++        boolean flag,
++        boolean flag1,
++        long i,
++        int j,
++        org.bukkit.generator.ChunkGenerator gen,
++        org.bukkit.generator.BiomeProvider biomeProvider,
++        org.bukkit.World.Environment env,
++        java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator,
++        java.util.function.Function<org.spigotmc.SpigotWorldConfig, org.plazmamc.plazma.configurations.WorldConfigurations> plazmaWorldConfigurationCreator,
++        java.util.concurrent.Executor executor
++    ) {
++    // Plazma end - Configurable Plazma
+         // Paper start - getblock optimisations - cache world height/sections
+         final DimensionType dimType = holder.value();
+         this.minY = dimType.minY();
+@@ -886,6 +908,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+         // Paper end - getblock optimisations - cache world height/sections
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
 +        this.plazmaConfig = plazmaWorldConfigurationCreator.apply(this.spigotConfig); // Plazma - Configurable Plazma
@@ -663,10 +708,10 @@ index 67a26f22d4eb7eaeee7900e6f4de421d0bfd5612..c4bfdf19651a3c8ef66795a6c7f5a29c
          this.playerBreedingCooldowns = this.getNewBreedingCooldownCache(); // Purpur
          this.generator = gen;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 694dc50e8446754b56b8e214b04c773ab01f06fc..01e22f11d24cdf62b0bf9d220fe351e9faccf5b6 100644
+index 81922bf93f8a96e6cf05944ca98a82cc5945a6c6..655463a7d588ed88778d137b6fe5ac18951ff172 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1068,6 +1068,7 @@ public final class CraftServer implements Server {
+@@ -1100,6 +1100,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -674,12 +719,12 @@ index 694dc50e8446754b56b8e214b04c773ab01f06fc..01e22f11d24cdf62b0bf9d220fe351e9
          org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
-@@ -3096,6 +3097,13 @@ public final class CraftServer implements Server {
+@@ -3112,6 +3113,13 @@ public final class CraftServer implements Server {
          }
          // Purpur end
  
 +        // Plazma start - Configurable Plazma
-+        @Override @org.jetbrains.annotations.NotNull
++        @Override
 +        public YamlConfiguration getPlazmaConfig() {
 +            return CraftServer.this.console.plazmaConfigurations.createLegacyObject(CraftServer.this.console);
 +        }
@@ -689,11 +734,11 @@ index 694dc50e8446754b56b8e214b04c773ab01f06fc..01e22f11d24cdf62b0bf9d220fe351e9
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 0f3ef5b27f72ba558765798d5f91d60bf5623029..2c82f8c25006123bacec5107a6380a67e927cc1d 100644
+index 75a062e1105c2f7cc631a6b8b201b0e08621e3c5..b75e2a9273e9562a3d07f68af927ad085c428589 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -195,6 +195,14 @@ public class Main {
+@@ -197,6 +197,14 @@ public class Main {
-                         .defaultsTo("Plazma Server") // Plazma - Branding
+                         .defaultsTo("A " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " Server") // Plazma - Fork-friendly Rebranding
                          .describedAs("Name");
                  // Paper end
 +
@@ -707,6 +752,22 @@ index 0f3ef5b27f72ba558765798d5f91d60bf5623029..2c82f8c25006123bacec5107a6380a67
              }
          };
  
+diff --git a/src/main/java/org/plazmamc/plazma/Options.java b/src/main/java/org/plazmamc/plazma/Options.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..ca11bd22a65c8b9f4fffb1832ada8c519ab75b98
+--- /dev/null
++++ b/src/main/java/org/plazmamc/plazma/Options.java
+@@ -0,0 +1,10 @@
++package org.plazmamc.plazma;
++
++import static java.lang.Boolean.getBoolean;
++import static java.lang.System.getProperty;
++
++public interface Options {
++
++    boolean NO_OPTIMIZE = getBoolean("Plazma.disableConfigOptimization");
++
++}
 diff --git a/src/main/java/org/plazmamc/plazma/commands/Commands.java b/src/main/java/org/plazmamc/plazma/commands/Commands.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..4497d8f8a52db0fc89ce27168b54657d172b1445
@@ -956,16 +1017,20 @@ index 0000000000000000000000000000000000000000..b6664ba0fce55f5cfa0c8d3051dc8c2b
 +}
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d8006ae086c18a4ef43906d516eba0d5fd397f5f
+index 0000000000000000000000000000000000000000..b638690d5cd2360444e6c525f97f634d8e1dc60e
 --- /dev/null
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,30 @@
 +package org.plazmamc.plazma.configurations;
 +
 +import io.papermc.paper.configuration.Configuration;
 +import io.papermc.paper.configuration.ConfigurationPart;
++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.Setting;
++import java.util.List;
 +
 +@SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "InnerClassMayBeStatic"})
 +public class GlobalConfiguration extends ConfigurationPart {
@@ -988,20 +1053,22 @@ index 0000000000000000000000000000000000000000..d8006ae086c18a4ef43906d516eba0d5
 +}
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..28deb72a851f353abaf50345983467e32ae3f4fd
+index 0000000000000000000000000000000000000000..09053b4ccf268fd204c81dbb8d4f10fa9edcad5f
 --- /dev/null
 +++ b/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java
-@@ -0,0 +1,218 @@
+@@ -0,0 +1,219 @@
 +package org.plazmamc.plazma.configurations;
 +
 +import com.mojang.logging.LogUtils;
 +import io.papermc.paper.configuration.ConfigurationPart;
 +import io.papermc.paper.configuration.Configurations;
++import joptsimple.OptionSet;
 +import net.minecraft.core.RegistryAccess;
 +import net.minecraft.server.level.ServerLevel;
 +import org.checkerframework.checker.nullness.qual.NonNull;
 +import org.checkerframework.framework.qual.DefaultQualifier;
 +import org.jetbrains.annotations.VisibleForTesting;
++import org.plazmamc.plazma.Options;
 +import org.slf4j.Logger;
 +import org.spongepowered.configurate.BasicConfigurationNode;
 +import org.spongepowered.configurate.ConfigurateException;
@@ -1011,6 +1078,7 @@ index 0000000000000000000000000000000000000000..28deb72a851f353abaf50345983467e3
 +import org.spongepowered.configurate.objectmapping.ObjectMapper;
 +import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
 +
++import java.io.File;
 +import java.nio.file.Path;
 +import java.util.function.Function;
 +
@@ -1019,12 +1087,12 @@ index 0000000000000000000000000000000000000000..28deb72a851f353abaf50345983467e3
 +@DefaultQualifier(NonNull.class)
 +public class PlazmaConfigurations extends Configurations<GlobalConfiguration, WorldConfigurations> {
 +
++    public static final Logger LOGGER = LogUtils.getClassLogger();
 +    public static final String CONFIG_DIR = "config";
-+    static final Logger LOGGER = LogUtils.getLogger();
 +    static final String GLOBAL_CONFIG_FILE_NAME = "plazma-global.yml";
 +    static final String WORLD_DEFAULTS_CONFIG_FILE_NAME = "plazma-world-defaults.yml";
 +    static final String WORLD_CONFIG_FILE_NAME = "plazma-world.yml";
-+    static final boolean OPTIMIZE = !Boolean.getBoolean("Plazma.disableConfigOptimization");
++    static final boolean OPTIMIZE = !Options.NO_OPTIMIZE;
 +
 +    private static final String HEADER_START = """
 +            #### ENGLISH ####
@@ -1051,7 +1119,7 @@ index 0000000000000000000000000000000000000000..28deb72a851f353abaf50345983467e3
 +            %s
 +            
 +            GitHub: https://github.com/PlazmaMC/Plazma
-+            Wiki: https://github.com/PlazmaMC/Plazma/wiki
++            Wiki: https://docs.plazmamc.org/
 +            Discord: https://plazmamc.org/discord
 +            """;
 +
@@ -1084,7 +1152,6 @@ index 0000000000000000000000000000000000000000..28deb72a851f353abaf50345983467e3
 +            If you need help with the configuration or have any questions related to Plazma,
 +            join us in our Discord for Plazma, or create issues on our GitHub repository.
 +            
-+            
 +            #### 한국어 ####
 +            본 파일은 %s (%s) 월드 전용 Plazma 구성 파일입니다.
 +            이 파일은 초기에는 비어있지만, 월드 기본 설정을 덮어쓰기 위해 설정을 추가할 수 있습니다.
@@ -1095,10 +1162,9 @@ index 0000000000000000000000000000000000000000..28deb72a851f353abaf50345983467e3
 +            만약 설정에 도움이 필요하거나, Plazma에 대해 질문이 있으시다면,
 +            공식 Discord 서버에 접속하거나, GitHub 레포지토리에 이슈를 생성해주시기 바랍니다.
 +            
-+            
 +            World Default Config Directory: %s/%s
 +            GitHub: https://github.com/PlazmaMC/Plazma
-+            Wiki: https://github.com/PlazmaMC/Plazma/wiki
++            Document: https://docs.plazmamc.org/
 +            Discord: https://plazmamc.org/discord
 +            """.formatted(
 +        map.require(WORLD_NAME), map.require(WORLD_KEY),
@@ -1106,8 +1172,8 @@ index 0000000000000000000000000000000000000000..28deb72a851f353abaf50345983467e3
 +        CONFIG_DIR, WORLD_DEFAULTS_CONFIG_FILE_NAME
 +    );
 +
-+    public PlazmaConfigurations(final Path globalFolder) {
++    public PlazmaConfigurations(final OptionSet optionSet) {
-+        super(globalFolder);
++        super(((File) optionSet.valueOf("plazma-settings-directory")).toPath());
 +    }
 +
 +    @Override
@@ -1189,7 +1255,7 @@ index 0000000000000000000000000000000000000000..28deb72a851f353abaf50345983467e3
 +    }
 +
 +    @Override
-+    protected Object createWorldConfigInstance(final ContextMap contextMap) {
++    protected WorldConfigurations createWorldConfigInstance(final ContextMap contextMap) {
 +        return new WorldConfigurations(contextMap.require(WORLD_KEY));
 +    }
 +
@@ -1257,36 +1323,45 @@ index 0000000000000000000000000000000000000000..f2d3d51cb4b8fc7a5fd6db1a63289fff
 +    int version = VERSION;
 +
 +}
-diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java
+diff --git a/src/main/java/plazma/Config.java b/src/main/java/plazma/Config.java
-index 381c1d681a982e28f1909bd954d21827549f7bcc..ed88464eef3eea8b8d7432e869cdf8100d8c54dc 100644
+new file mode 100644
---- a/src/test/java/org/bukkit/support/AbstractTestingBase.java
+index 0000000000000000000000000000000000000000..dbba467f668600ef3dcc653d9bfe1f712c69e245
-+++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java
+--- /dev/null
-@@ -63,6 +63,7 @@ public abstract class AbstractTestingBase {
++++ b/src/main/java/plazma/Config.java
+@@ -0,0 +1,21 @@
++package plazma;
++
++import org.jetbrains.annotations.Contract;
++import org.jspecify.annotations.NonNull;
++import org.plazmamc.plazma.configurations.GlobalConfiguration;
++import org.plazmamc.plazma.configurations.PlazmaConfigurations;
++import java.util.List;
++
++public interface Config {
++
++    @Contract(pure = true)
++    static boolean optimize() {
++        return PlazmaConfigurations.optimize();
++    }
++
++    @Contract(pure = true)
++    static @NonNull GlobalConfiguration get() {
++        return GlobalConfiguration.get();
++    }
++
++}
+diff --git a/src/test/java/org/bukkit/support/DummyServerHelper.java b/src/test/java/org/bukkit/support/DummyServerHelper.java
+index 309d371247adcddf0a1b370cc5faff3e6e01cb0f..285a90ff5cdc8cb28fafd4ea3dae306ae5b899c9 100644
+--- a/src/test/java/org/bukkit/support/DummyServerHelper.java
++++ b/src/test/java/org/bukkit/support/DummyServerHelper.java
+@@ -92,6 +92,7 @@ public final class DummyServerHelper {
+         // Paper end - testing additions
  
-         DummyServer.setup();
+         io.papermc.paper.configuration.GlobalConfigTestingBase.setupGlobalConfigForTest(); // Paper - configuration files - setup global configuration test base
-         io.papermc.paper.configuration.GlobalConfigTestingBase.setupGlobalConfigForTest(); // Paper
 +        org.plazmamc.plazma.configurations.GlobalConfigurationTestingBase.setupGlobalConfigForTest(); // Plazma - Configurable Plazma
  
-         CraftRegistry.setMinecraftRegistry(REGISTRY_CUSTOM);
+         // Paper start - add test for recipe conversion
- 
+         when(instance.recipeIterator()).thenAnswer(ignored ->
-diff --git a/src/test/java/org/bukkit/support/DummyServer.java b/src/test/java/org/bukkit/support/DummyServer.java
-index 3b3e44c5ed24f653f7dc1e5d3d4f0ff76084f277..9391d5447e26a42142c6b44c8e470b35c0f9b0cf 100644
---- a/src/test/java/org/bukkit/support/DummyServer.java
-+++ b/src/test/java/org/bukkit/support/DummyServer.java
-@@ -57,6 +57,13 @@ public final class DummyServer {
-             when(instance.getTag(anyString(), any(org.bukkit.NamespacedKey.class), any())).thenAnswer(ignored -> new io.papermc.paper.util.EmptyTag());
-             // paper end - testing additions
- 
-+            // Plazma start - Configurable Plazma
-+            net.minecraft.server.MinecraftServer handle = mock(withSettings().stubOnly());
-+            when(handle.random()).thenReturn(net.minecraft.util.RandomSource.create());
-+            when(handle.getFixerUpper()).thenReturn(net.minecraft.util.datafix.DataFixers.getDataFixer());
-+            net.minecraft.server.MinecraftServer.setServer(handle);
-+            // Plazma end - Configurable Plazma
-+
-             Bukkit.setServer(instance);
-         } catch (Throwable t) {
-             throw new Error(t);
 diff --git a/src/test/java/org/plazmamc/plazma/configurations/GlobalConfigurationTestingBase.java b/src/test/java/org/plazmamc/plazma/configurations/GlobalConfigurationTestingBase.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..c63942e2dc00ed6d6b4119f418bdaa5a64b4c0fe

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

@@ -5,21 +5,27 @@ 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 69c4d9cb0532621018f6cd99916c409fc150ab7e..f8dc4f4e2cbc8034e5e274e5b7245d4e2b4bf38b 100644
+index b638690d5cd2360444e6c525f97f634d8e1dc60e..35d5bd2f7dba1aa74547b6ae994bc84a56911bf2 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -3,6 +3,7 @@ package org.plazmamc.plazma.configurations;
+@@ -6,6 +6,7 @@ import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
- import io.papermc.paper.configuration.Configuration;
+ import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
- import io.papermc.paper.configuration.ConfigurationPart;
+ 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;
  
- @SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "InnerClassMayBeStatic"})
+@@ -27,4 +28,55 @@ public class GlobalConfiguration extends ConfigurationPart {
-@@ -23,4 +24,43 @@ public class GlobalConfiguration extends ConfigurationPart {
      @Setting(Configuration.VERSION_FIELD)
      int version = VERSION;
  
++    public Command command;
++    public class Command extends ConfigurationPart {
++
++
++    }
++
 +    public Player player;
 +    public class Player extends ConfigurationPart {
 +
@@ -53,6 +59,12 @@ index 69c4d9cb0532621018f6cd99916c409fc150ab7e..f8dc4f4e2cbc8034e5e274e5b7245d4e
 +
 +    }
 +
++    public Structure structure;
++    public class Structure extends ConfigurationPart {
++
++
++    }
++
 +    public Miscellaneous misc;
 +    public class Miscellaneous extends ConfigurationPart {
 +
@@ -60,11 +72,28 @@ index 69c4d9cb0532621018f6cd99916c409fc150ab7e..f8dc4f4e2cbc8034e5e274e5b7245d4e
 +    }
 +
  }
+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 842fb520a2d638aaa5bd0a7198190dbe3ecbe14c..a372b5be3b1da5868d3766a8ba58997a48118581 100644
+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,32 @@ public class WorldConfigurations extends ConfigurationPart {
+@@ -19,4 +19,44 @@ public class WorldConfigurations extends ConfigurationPart {
      @Setting(Configuration.VERSION_FIELD)
      int version = VERSION;
  
@@ -95,5 +124,17 @@ index 842fb520a2d638aaa5bd0a7198190dbe3ecbe14c..a372b5be3b1da5868d3766a8ba58997a
 +        }
 +
 +    }
++
++    public Block block;
++    public class Block extends ConfigurationPart {
++        
++
++    }
++
++    public Item item;
++    public class Item extends ConfigurationPart {
++
++
++    }
 +
  }

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

@@ -0,0 +1,40 @@
+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 8f77566bef4b992013e3b65068cabe7ee1921951..65fd553887ed9eb9c26e036c8009179a7baf5380 100644
+--- a/src/main/java/net/minecraft/server/Main.java
++++ b/src/main/java/net/minecraft/server/Main.java
+@@ -113,6 +113,18 @@ public class Main {
+             if (io.papermc.paper.ServerBrandConstants.ASCII_LOGO != null)
+                 System.out.println(io.papermc.paper.ServerBrandConstants.ASCII_LOGO);
+             // Plazma end - Fork-friendly Rebranding
++            // Plazma start - Warn on startup
++            if (!org.plazmamc.plazma.Options.NO_WARN) {
++                LOGGER.warn("Warning! " + io.papermc.paper.ServerBrandConstants.BRAND_NAME + " may cause unexpected problems, so be sure to test it thoroughly before using it on a public server.");
++                if (io.papermc.paper.ServerBuildInfo.buildInfo().asString(io.papermc.paper.ServerBuildInfo.StringRepresentation.VERSION_FULL).contains("DEV")) {
++                    LOGGER.error("*********************** CAUTION ***********************");
++                    LOGGER.error("This version is a development version of {}.", io.papermc.paper.ServerBrandConstants.BRAND_NAME);
++                    LOGGER.error("Nobody knows what kind of problem you're going to have, and there's always the possibility of unexpected problems.");
++                    LOGGER.error("Never use this version on a public server, and after you've tested it enough before using it!");
++                    LOGGER.error("*******************************************************");
++                }
++            }
++            // Plazma end
+ 
+             Path path = (Path) optionset.valueOf("pidFile"); // CraftBukkit
+ 
+diff --git a/src/main/java/org/plazmamc/plazma/Options.java b/src/main/java/org/plazmamc/plazma/Options.java
+index ca11bd22a65c8b9f4fffb1832ada8c519ab75b98..5d41bd4d4b86ca0c7c03d3ac6e75b3f1f1abe73b 100644
+--- a/src/main/java/org/plazmamc/plazma/Options.java
++++ b/src/main/java/org/plazmamc/plazma/Options.java
+@@ -6,5 +6,6 @@ import static java.lang.System.getProperty;
+ public interface Options {
+ 
+     boolean NO_OPTIMIZE = getBoolean("Plazma.disableConfigOptimization");
++    boolean NO_WARN = getBoolean("Plazma.iKnowWhatIAmDoing");
+ 
+ }

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

@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Sun, 5 Nov 2023 10:13:14 +0900
+Subject: [PATCH] Always agree EULA on development mode
+
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 41005f58fdd526907972185e728bbe1fa97171e9..746ad8087192931400256c8a1ef71e966eaf6b1a 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("-DPlazma.DevelopmentEnvironment", "-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods") // Plazma - Always agree EULA on development mode
+ 
+     if (rootProject.childProjects["test-plugin"] != null) {
+         val testPluginJar = rootProject.project(":test-plugin").tasks.jar.flatMap { it.archiveFile }
+diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
+index 65fd553887ed9eb9c26e036c8009179a7baf5380..694b126df2c3d1d6fa40ee9731c28886caf1a4fc 100644
+--- a/src/main/java/net/minecraft/server/Main.java
++++ b/src/main/java/net/minecraft/server/Main.java
+@@ -179,6 +179,7 @@ public class Main {
+ 
+             // Spigot Start
+             boolean eulaAgreed = Boolean.getBoolean( "com.mojang.eula.agree" );
++            eulaAgreed = eulaAgreed || Boolean.getBoolean("Paper.pushPaperAssetsRoot"); // Plazma - Always agree EULA on development mode
+             if ( eulaAgreed )
+             {
+                 System.err.println( "You have used the Spigot command line EULA agreement flag." );

patches/server/0010-Port-SparklyPaper-patches.patch

@@ -1,118 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Thu, 25 Jan 2024 17:13:09 +0900
-Subject: [PATCH] Port SparklyPaper patches
-
-SparklyPower
-Copyright (C) 2024 SparklyPower
-
-Based on commit: 29212936a832106c4d68e2a2017acbea2fdd3cc4
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 04b98e23eed926d8473cc2464e04a5b9f18f1140..cf098d4a3111771c13766285c5ec5f1fc1f539a4 100644
---- a/src/main/java/net/minecraft/server/level/ServerEntity.java
-+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -74,6 +74,7 @@ public class ServerEntity {
-     private List<SynchedEntityData.DataValue<?>> trackedDataValues;
-     // CraftBukkit start
-     public final Set<ServerPlayerConnection> trackedPlayers; // Purpur - private -> public
-+    public static boolean skipSqrWhenNoDeltaChanges = false; // Plazma - SparklyPaper port; Skip distanceToSqr if the delta movement hasn't changed
- 
-     public ServerEntity(ServerLevel worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<ServerPlayerConnection> trackedPlayers) {
-         this.trackedPlayers = trackedPlayers;
-@@ -210,12 +211,14 @@ public class ServerEntity {
- 
-                 if ((this.trackDelta || this.entity.hasImpulse || this.entity instanceof LivingEntity && ((LivingEntity) this.entity).isFallFlying()) && this.tickCount > 0) {
-                     Vec3 vec3d1 = this.entity.getDeltaMovement();
-+                    if (!skipSqrWhenNoDeltaChanges && vec3d1 != this.ap) { // Plazma - SparklyPaper port; Skip distanceToSqr if the delta movement hasn't changed
-                     double d0 = vec3d1.distanceToSqr(this.ap);
- 
-                     if (d0 > 1.0E-7D || d0 > 0.0D && vec3d1.lengthSqr() == 0.0D) {
-                         this.ap = vec3d1;
-                         this.broadcast.accept(new ClientboundSetEntityMotionPacket(this.entity.getId(), this.ap));
-                     }
-+                    } // Plazma - SparklyPaper port; Skip distanceToSqr if the delta movement hasn't changed
-                 }
- 
-                 if (packet1 != null) {
-diff --git a/src/main/java/net/minecraft/stats/ServerStatsCounter.java b/src/main/java/net/minecraft/stats/ServerStatsCounter.java
-index f890738d3bb9fb5e70a9d323c6cec97f9948f9cf..52e72277c661b67a54bc5ce584efb04134599dd3 100644
---- a/src/main/java/net/minecraft/stats/ServerStatsCounter.java
-+++ b/src/main/java/net/minecraft/stats/ServerStatsCounter.java
-@@ -243,7 +243,7 @@ public class ServerStatsCounter extends StatsCounter {
- 
-     public void sendStats(ServerPlayer player) {
-         Object2IntMap<Stat<?>> object2intmap = new Object2IntOpenHashMap();
--        Iterator iterator = this.getDirty().iterator();
-+        Iterator<Stat<?>> iterator = this.dirty.iterator(); // Plazma - SparklyPaper port; Skip dirty stats copy when requesting player stats
- 
-         while (iterator.hasNext()) {
-             Stat<?> statistic = (Stat) iterator.next();
-@@ -251,6 +251,7 @@ public class ServerStatsCounter extends StatsCounter {
-             object2intmap.put(statistic, this.getValue(statistic));
-         }
- 
-+        this.dirty.clear(); // Plazma - SparklyPaper port; Skip dirty stats copy when requesting player stats
-         player.connection.send(new ClientboundAwardStatsPacket(object2intmap));
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/item/MapItem.java b/src/main/java/net/minecraft/world/item/MapItem.java
-index 8d3c1897044f9a2bbe1911e1a72dc9a00fb246df..a68112a1d1904edfc84acb6c209e13f0836d97e0 100644
---- a/src/main/java/net/minecraft/world/item/MapItem.java
-+++ b/src/main/java/net/minecraft/world/item/MapItem.java
-@@ -313,12 +313,14 @@ public class MapItem extends ComplexItem {
-         }
-     }
- 
-+    public static boolean skipTickWhenCraftNotPresent = false; // Plazma - SparklyPaper port; Skip map item ticking if the craft map renderer is not present
-     @Override
-     public void inventoryTick(ItemStack stack, Level world, Entity entity, int slot, boolean selected) {
-         if (!world.isClientSide) {
-             MapItemSavedData worldmap = MapItem.getSavedData(stack, world);
- 
-             if (worldmap != null) {
-+                if (skipTickWhenCraftNotPresent && worldmap.mapView.getRenderers().stream().noneMatch(mapRenderer -> mapRenderer.getClass() == org.bukkit.craftbukkit.map.CraftMapRenderer.class)) return; // Plazma - SparklyPaper port; Skip map item ticking if the craft map renderer is not present
-                 if (entity instanceof Player) {
-                     Player entityhuman = (Player) entity;
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapColorCache.java b/src/main/java/org/bukkit/craftbukkit/map/CraftMapColorCache.java
-index 8149b9c51b78eb5c689b7218a2ca3aab60e73bcf..b9a303f6280a2f6ad3616da152922a4f4a504281 100644
---- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapColorCache.java
-+++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapColorCache.java
-@@ -145,7 +145,7 @@ public class CraftMapColorCache implements MapPalette.MapColorCache {
-     }
- 
-     @Override
--    public boolean isCached() {
-+    public synchronized boolean isCached() { // Plazma - Fix concurrency issues when using "imageToBytes" in multiple threads
-         return this.cached || (!this.running.get() && this.initCache().isDone());
-     }
- 
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index f8dc4f4e2cbc8034e5e274e5b7245d4e2b4bf38b..2adaa7c6433ac3f54c9d75ee3c14772b4c538418 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -40,9 +40,11 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public Entity entity;
-     public class Entity extends ConfigurationPart {
- 
-+        boolean skipSqrWhenNoDeltaChanges = OPTIMIZE;
- 
-         @PostProcess
-         public void post() {
-+            net.minecraft.server.level.ServerEntity.skipSqrWhenNoDeltaChanges = this.skipSqrWhenNoDeltaChanges;
-         }
- 
-     }
-@@ -50,9 +52,11 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public World world;
-     public class World extends ConfigurationPart {
- 
-+        boolean skipTickWhenCraftNotPresent = OPTIMIZE;
- 
-         @PostProcess
-         public void post() {
-+            net.minecraft.world.item.MapItem.skipTickWhenCraftNotPresent = this.skipTickWhenCraftNotPresent;
-         }
- 
-     }

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

@@ -5,7 +5,7 @@ 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 0b3d87d2d43148e6370e7a03e0bb6074891ac800..8783c81af1d09e6682256dee0dd546de0be418cd 100644
+index 8d5a52c5762c3d9b44dcdf00ae312e0bdc01fa1f..48d33d4131af90eee35c9553898a2ac7ec5e2b7e 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
 @@ -636,38 +636,59 @@ public class Metrics {

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

@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 5 Nov 2023 10:13:14 +0900
-Subject: [PATCH] Always agree EULA on development mode
-
-
-diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 3e1079e9af85c62684ce19a7afaac5adc2167cb6..60382055ccb199e32fb201fddfe34f05bf919195 100644
---- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
-@@ -179,6 +179,7 @@ public class Main {
- 
-             // Spigot Start
-             boolean eulaAgreed = Boolean.getBoolean( "com.mojang.eula.agree" );
-+            eulaAgreed = eulaAgreed || Boolean.getBoolean("Paper.isRunDev"); // Plazma - Always agree EULA on development mode
-             if ( eulaAgreed )
-             {
-                 System.err.println( "You have used the Spigot command line EULA agreement flag." );

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

@@ -9,69 +9,47 @@ Subject: [PATCH] Optimize default configurations
 - YouHaveTrouble/minecraft-exploits-and-how-to-fix-them
 
 diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-index 3fea9b69f4cfc94e7f01d4e3ca4ce7506a8e5d5c..5a88d2e4c7a533e420cef33830a0cc6484bfd979 100644
+index 411c81a88b8a008b2aaf0ca62fb7ffa1dd9e32a4..53dc2e3c22c5cb038b9a283112f265d362f187e3 100644
 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-@@ -64,7 +64,7 @@ public class PufferfishConfig {
+@@ -61,7 +61,7 @@ public class PufferfishConfig {
  		getString("info.version", "1.0");
  		setComment("info",
  				"Pufferfish Configuration",
 -				"Check out Pufferfish Host for maximum performance server hosting: https://pufferfish.host",
-+				//"Check out Pufferfish Host for maximum performance server hosting: https://pufferfish.host", // Plazma - Sponsorblock
++				// "Check out Pufferfish Host for maximum performance server hosting: https://pufferfish.host", // Plazma - Sponsorblock
  				"Join our Discord for support: https://discord.gg/reZw4vQV9H",
  				"Download new builds at https://ci.pufferfish.host/job/Pufferfish");
  		
-@@ -219,7 +219,7 @@ public class PufferfishConfig {
+@@ -216,7 +216,7 @@ public class PufferfishConfig {
      public static int maxProjectileLoadsPerTick;
      public static int maxProjectileLoadsPerProjectile;
      private static void projectileLoading() {
 -        maxProjectileLoadsPerTick = getInt("projectile.max-loads-per-tick", 10, "Controls how many chunks are allowed", "to be sync loaded by projectiles in a tick.");
-+        maxProjectileLoadsPerTick = getInt("projectile.max-loads-per-tick", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 8 : 10, "Controls how many chunks are allowed", "to be sync loaded by projectiles in a tick."); // Plazma - Optimize default configurations
++        maxProjectileLoadsPerTick = getInt("projectile.max-loads-per-tick", plazma.Config.optimize() ? 8 : 10, "Controls how many chunks are allowed", "to be sync loaded by projectiles in a tick."); // Plazma - Optimize default configurations
          maxProjectileLoadsPerProjectile = getInt("projectile.max-loads-per-projectile", 10, "Controls how many chunks a projectile", "can load in its lifetime before it gets", "automatically removed.");
  
          setComment("projectile", "Optimizes projectile settings");
-@@ -233,7 +233,7 @@ public class PufferfishConfig {
+@@ -230,12 +230,12 @@ public class PufferfishConfig {
      public static int activationDistanceMod;
  
      private static void dynamicActivationOfBrains() throws IOException {
 -        dearEnabled = getBoolean("dab.enabled", "activation-range.enabled", false); // Purpur
-+        dearEnabled = getBoolean("dab.enabled", "activation-range.enabled", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize()); // Purpur // Plazma - Optimize default configurations
++        dearEnabled = getBoolean("dab.enabled", "activation-range.enabled", plazma.Config.optimize()); // Purpur // Plazma - Optimize default configurations
          startDistance = getInt("dab.start-distance", "activation-range.start-distance", 12,
                  "This value determines how far away an entity has to be",
                  "from the player to start being effected by DEAR.");
-@@ -241,7 +241,7 @@ public class PufferfishConfig {
+         startDistanceSquared = startDistance * startDistance;
-         maximumActivationPrio = getInt("dab.max-tick-freq", "activation-range.max-tick-freq", 20,
+-        maximumActivationPrio = getInt("dab.max-tick-freq", "activation-range.max-tick-freq", 20,
++        maximumActivationPrio = getInt("dab.max-tick-freq", "activation-range.max-tick-freq", plazma.Config.optimize() ? 7 : 8, // Plazma - Optimize default configurations
                  "This value defines how often in ticks, the furthest entity",
                  "will get their pathfinders and behaviors ticked. 20 = 1s");
--        activationDistanceMod = getInt("dab.activation-dist-mod", "activation-range.activation-dist-mod", 8,
+         activationDistanceMod = getInt("dab.activation-dist-mod", "activation-range.activation-dist-mod", 8,
-+        activationDistanceMod = getInt("dab.activation-dist-mod", "activation-range.activation-dist-mod", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 7 : 8, // Plazma - Optimize default configurations
-                 "This value defines how much distance modifies an entity's",
-                 "tick frequency. freq = (distanceToPlayer^2) / (2^value)",
-                 "If you want further away entities to tick less often, use 7.",
-@@ -261,8 +261,18 @@ public class PufferfishConfig {
- 	public static Map<String, Integer> projectileTimeouts;
- 	private static void projectileTimeouts() {
- 		// Set some defaults
-+        // Plazma start - Optimize default configurations
-+        if (org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize()) {
-+            getInt("entity_timeouts.ARROW", 200);
-+            getInt("entity_timeouts.EGG", 200);
-+            getInt("entity_timeouts.ENDER_PEARL", 200);
-+            getInt("entity_timeouts.SNOWBALL", 200);
-+            getInt("entity_timeouts.LLAMA_SPIT", 200);
-+        } else {
-+        // Plazma end
- 		getInt("entity_timeouts.SNOWBALL", -1);
- 		getInt("entity_timeouts.LLAMA_SPIT", -1);
-+        } // Plazma
- 		setComment("entity_timeouts",
- 				"These values define a entity's maximum lifespan. If an",
- 				"entity is in this list and it has survived for longer than",
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index a6f58b3457b7477015c5c6d969e7d83017dd3fa1..85e56d726eb7780811e0a990e1ef7d3ec767e36d 100644
+index 17e23ca4dd2bbfba49ea00aa2b719a95feb931be..a8e75eaadfcc6c8b2503776d7de197f756712819 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -155,7 +155,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -147,7 +147,7 @@ public class GlobalConfiguration extends ConfigurationPart {
  
      public class Watchdog extends ConfigurationPart {
          public int earlyWarningEvery = 5000;
@@ -80,7 +58,7 @@ index a6f58b3457b7477015c5c6d969e7d83017dd3fa1..85e56d726eb7780811e0a990e1ef7d3e
      }
  
      public SpamLimiter spamLimiter;
-@@ -193,7 +193,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -187,7 +187,7 @@ public class GlobalConfiguration extends ConfigurationPart {
      public Commands commands;
  
      public class Commands extends ConfigurationPart {
@@ -89,16 +67,16 @@ index a6f58b3457b7477015c5c6d969e7d83017dd3fa1..85e56d726eb7780811e0a990e1ef7d3e
          public boolean fixTargetSelectorTagCompletion = true;
          public boolean timeCommandAffectsAllWorlds = false;
      }
-@@ -242,7 +242,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -253,7 +253,7 @@ public class GlobalConfiguration extends ConfigurationPart {
          public BookSize bookSize;
  
          public class BookSize extends ConfigurationPart {
--            public int pageMax = 2560; // TODO this appears to be a duplicate setting with one above
+-            public IntOr.Disabled pageMax = new IntOr.Disabled(OptionalInt.of(2560)); // TODO this appears to be a duplicate setting with one above
-+            public int pageMax = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 1024 : 2560; // TODO this appears to be a duplicate setting with one above // Plazma - Optimize default configurations
++            public IntOr.Disabled pageMax = new IntOr.Disabled(OptionalInt.of(org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 1024 : 2560)); // TODO this appears to be a duplicate setting with one above // Plazma - Optimize default configurations
              public double totalMultiplier = 0.98D; // TODO this should probably be merged into the above inner class
          }
          public boolean resolveSelectorsInBooks = false;
-@@ -253,7 +253,15 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -264,7 +264,15 @@ public class GlobalConfiguration extends ConfigurationPart {
      public class PacketLimiter extends ConfigurationPart {
          public Component kickMessage = Component.translatable("disconnect.exceeded_packet_rate", NamedTextColor.RED);
          public PacketLimit allPackets = new PacketLimit(7.0, 500.0, PacketLimit.ViolateAction.KICK);
@@ -115,7 +93,7 @@ index a6f58b3457b7477015c5c6d969e7d83017dd3fa1..85e56d726eb7780811e0a990e1ef7d3e
  
          @ConfigSerializable
          public record PacketLimit(@Required double interval, @Required double maxPacketRate, ViolateAction action) {
-@@ -321,7 +329,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -332,7 +340,7 @@ public class GlobalConfiguration extends ConfigurationPart {
                  executor.setMaximumPoolSize(_chatExecutorMaxSize);
              }
          }
@@ -125,10 +103,10 @@ index a6f58b3457b7477015c5c6d969e7d83017dd3fa1..85e56d726eb7780811e0a990e1ef7d3e
          public boolean loadPermissionsYmlBeforePlugins = true;
          @Constraints.Min(4)
 diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-index 385ca2c1022e0985550a5cc2bbff953f1aa33f5c..121ee93d65bcaa26bdc3e57750107cdb54f8d6d7 100644
+index 82210667376fd466d5d4cdcb56b62f6165bd5cde..3c6e9ec236bfd851700ce7fae2599b725ec899eb 100644
 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-@@ -96,12 +96,32 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -103,12 +103,32 @@ public class WorldConfiguration extends ConfigurationPart {
  
          public class AntiXray extends ConfigurationPart {
              public boolean enabled = false;
@@ -142,35 +120,35 @@ index 385ca2c1022e0985550a5cc2bbff953f1aa33f5c..121ee93d65bcaa26bdc3e57750107cdb
 -            public List<Block> hiddenBlocks = List.of(
 +            // Plazma start - Optimize default configurations
 +            public List<Block> hiddenBlocks = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? List.of(
-+                    //<editor-fold desc="Anti-Xray Hidden Blocks" defaultstate="collapsed">
++                //<editor-fold desc="Anti-Xray Hidden Blocks" defaultstate="collapsed">
-+                    Blocks.AIR,
++                Blocks.AIR,
-+                    Blocks.COPPER_ORE,
++                Blocks.COPPER_ORE,
-+                    Blocks.DEEPSLATE_COPPER_ORE,
++                Blocks.DEEPSLATE_COPPER_ORE,
-+                    Blocks.RAW_COPPER_BLOCK,
++                Blocks.RAW_COPPER_BLOCK,
-+                    Blocks.IRON_ORE,
++                Blocks.IRON_ORE,
-+                    Blocks.DEEPSLATE_IRON_ORE,
++                Blocks.DEEPSLATE_IRON_ORE,
-+                    Blocks.RAW_IRON_BLOCK,
++                Blocks.RAW_IRON_BLOCK,
-+                    Blocks.GOLD_ORE,
++                Blocks.GOLD_ORE,
-+                    Blocks.DEEPSLATE_GOLD_ORE,
++                Blocks.DEEPSLATE_GOLD_ORE,
-+                    Blocks.RAW_GOLD_BLOCK,
++                Blocks.RAW_GOLD_BLOCK,
-+                    Blocks.REDSTONE_ORE,
++                Blocks.REDSTONE_ORE,
-+                    Blocks.DEEPSLATE_REDSTONE_ORE,
++                Blocks.DEEPSLATE_REDSTONE_ORE,
-+                    Blocks.LAPIS_ORE,
++                Blocks.LAPIS_ORE,
-+                    Blocks.DEEPSLATE_LAPIS_ORE,
++                Blocks.DEEPSLATE_LAPIS_ORE,
-+                    Blocks.DIAMOND_ORE,
++                Blocks.DIAMOND_ORE,
-+                    Blocks.DEEPSLATE_DIAMOND_ORE
++                Blocks.DEEPSLATE_DIAMOND_ORE
-+                    //</editor-fold>
++                //</editor-fold>
 +            ) : List.of(
                  //<editor-fold desc="Anti-Xray Hidden Blocks" defaultstate="collapsed">
                  Blocks.COPPER_ORE,
                  Blocks.DEEPSLATE_COPPER_ORE,
-@@ -128,7 +148,28 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -135,7 +155,28 @@ public class WorldConfiguration extends ConfigurationPart {
                  Blocks.ENDER_CHEST
                  //</editor-fold>
              );
 -            public List<Block> replacementBlocks = List.of(Blocks.STONE, Blocks.OAK_PLANKS, Blocks.DEEPSLATE);
 +            public List<Block> replacementBlocks = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? List.of(
-+                    //<editor-fold desc="Anti-Xray Hidden Blocks" defaultstate="collapsed">
++                    //<editor-fold desc="Anti-Xray Replacement Blocks" defaultstate="collapsed">
 +                    Blocks.CHEST,
 +                    Blocks.AMETHYST_BLOCK,
 +                    Blocks.ANDESITE,
@@ -194,14 +172,14 @@ index 385ca2c1022e0985550a5cc2bbff953f1aa33f5c..121ee93d65bcaa26bdc3e57750107cdb
          }
      }
  
-@@ -152,14 +193,14 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -157,14 +198,14 @@ public class WorldConfiguration extends ConfigurationPart {
          public ArmorStands armorStands;
  
          public class ArmorStands extends ConfigurationPart {
 -            public boolean doCollisionEntityLookups = true;
 -            public boolean tick = true;
-+            public boolean doCollisionEntityLookups = !org.plazmamc.plazma.Options.aggressiveOptimize; // Plazma - Optimize default configurations
++            public boolean doCollisionEntityLookups = !org.plazmamc.plazma.Options.AGGRESSIVE; // Plazma - Optimize default configurations
-+            public boolean tick = !org.plazmamc.plazma.Options.aggressiveOptimize; // Plazma - Optimize default configurations
++            public boolean tick = !org.plazmamc.plazma.Options.AGGRESSIVE; // Plazma - Optimize default configurations
          }
  
          public Markers markers;
@@ -212,16 +190,7 @@ index 385ca2c1022e0985550a5cc2bbff953f1aa33f5c..121ee93d65bcaa26bdc3e57750107cdb
          }
  
          public Sniffer sniffer;
-@@ -182,7 +223,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -415,7 +456,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
- 
-             @ConfigSerializable
-             public record DespawnRange(@Required int soft, @Required int hard) {
-@@ -381,7 +422,7 @@ public class WorldConfiguration extends ConfigurationPart {
      public class Environment extends ConfigurationPart {
          public boolean disableThunder = false;
          public boolean disableIceAndSnow = false;
@@ -230,16 +199,16 @@ index 385ca2c1022e0985550a5cc2bbff953f1aa33f5c..121ee93d65bcaa26bdc3e57750107cdb
          public boolean disableExplosionKnockback = false;
          public boolean generateFlatBedrock = false;
          public FrostedIce frostedIce;
-@@ -433,7 +474,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -471,7 +512,7 @@ public class WorldConfiguration extends ConfigurationPart {
      public Fixes fixes;
  
      public class Fixes extends ConfigurationPart {
 -        public boolean fixItemsMergingThroughWalls = false;
 +        public boolean fixItemsMergingThroughWalls = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize(); // Plazma - Optimize default configurations
-         public boolean disableUnloadedChunkEnderpearlExploit = true;
+         public boolean disableUnloadedChunkEnderpearlExploit = false;
          public boolean preventTntFromMovingInWater = false;
          public boolean splitOverstackedLoot = true;
-@@ -460,9 +501,9 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -499,9 +540,9 @@ public class WorldConfiguration extends ConfigurationPart {
      public class Collisions extends ConfigurationPart {
          public boolean onlyPlayersCollide = false;
          public boolean allowVehicleCollisions = true;
@@ -251,7 +220,7 @@ index 385ca2c1022e0985550a5cc2bbff953f1aa33f5c..121ee93d65bcaa26bdc3e57750107cdb
          public boolean allowPlayerCrammingDamage = false;
      }
  
-@@ -470,18 +511,41 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -509,18 +550,41 @@ public class WorldConfiguration extends ConfigurationPart {
  
      public class Chunks extends ConfigurationPart {
          public AutosavePeriod autoSaveInterval = AutosavePeriod.def();
@@ -301,7 +270,7 @@ index 385ca2c1022e0985550a5cc2bbff953f1aa33f5c..121ee93d65bcaa26bdc3e57750107cdb
          });
          public boolean flushRegionsOnSave = false;
      }
-@@ -496,9 +560,9 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -535,9 +599,9 @@ public class WorldConfiguration extends ConfigurationPart {
      public TickRates tickRates;
  
      public class TickRates extends ConfigurationPart {
@@ -313,18 +282,18 @@ index 385ca2c1022e0985550a5cc2bbff953f1aa33f5c..121ee93d65bcaa26bdc3e57750107cdb
          public int wetFarmland = 1;
          public int dryFarmland = 1;
          public Table<EntityType<?>, String, Integer> sensor = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "secondarypoisensor", 40));
-@@ -532,9 +596,9 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -571,9 +635,9 @@ public class WorldConfiguration extends ConfigurationPart {
  
      public class Misc extends ConfigurationPart {
          public int lightQueueSize = 20;
 -        public boolean updatePathfindingOnBlockUpdate = true;
-+        public boolean updatePathfindingOnBlockUpdate = !org.plazmamc.plazma.Options.aggressiveOptimize; // Plazma - Optimize default configurations
++        public boolean updatePathfindingOnBlockUpdate = !org.plazmamc.plazma.Options.AGGRESSIVE; // Plazma - Optimize default configurations
          public boolean showSignClickCommandFailureMsgsToPlayer = false;
 -        public RedstoneImplementation redstoneImplementation = RedstoneImplementation.VANILLA;
 +        public RedstoneImplementation redstoneImplementation = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? RedstoneImplementation.ALTERNATE_CURRENT : RedstoneImplementation.VANILLA; // Plazma - Optimize default configurations
+         public AlternateCurrentUpdateOrder alternateCurrentUpdateOrder = AlternateCurrentUpdateOrder.HORIZONTAL_FIRST_OUTWARD;
          public boolean disableEndCredits = false;
-         public float maxLeashDistance = 10f;
+         public DoubleOr.Default maxLeashDistance = DoubleOr.Default.USE_DEFAULT;
-         public boolean disableSprintInterruptionOnAttack = false;
 diff --git a/src/main/java/io/papermc/paper/configuration/type/fallback/ArrowDespawnRate.java b/src/main/java/io/papermc/paper/configuration/type/fallback/ArrowDespawnRate.java
 index 24763d3d270c29c95e0b3e85111145234f660a62..80ddc627e02e3c749e6b074afa93d357d9c7d62a 100644
 --- a/src/main/java/io/papermc/paper/configuration/type/fallback/ArrowDespawnRate.java
@@ -338,7 +307,7 @@ index 24763d3d270c29c95e0b3e85111145234f660a62..80ddc627e02e3c749e6b074afa93d357
      }
  
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 60382055ccb199e32fb201fddfe34f05bf919195..d83bd5774f49af33119ea5224a2300d435898095 100644
+index 694b126df2c3d1d6fa40ee9731c28886caf1a4fc..822ecda5f4dc6cc8cd0cc4da577f27cdcc5c4967 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -164,7 +164,7 @@ public class Main {
@@ -351,10 +320,10 @@ index 60382055ccb199e32fb201fddfe34f05bf919195..d83bd5774f49af33119ea5224a2300d4
  
                  File commandFile = (File) optionset.valueOf("commands-settings");
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index a66dcea06424518290576c7647ae0717040586f9..41d5d15dfa2affdee68501efb2447a209c38992d 100644
+index 8f7e922ceca286b1a590181c301fbe9bff55c024..3dd5c7441bb300ca17d717af37edbefb89db4b2f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-@@ -130,14 +130,14 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
+@@ -132,14 +132,14 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
          this.spawnMonsters = this.get("spawn-monsters", true);
          this.useNativeTransport = this.get("use-native-transport", true);
          this.enableCommandBlock = this.get("enable-command-block", false);
@@ -373,20 +342,20 @@ index a66dcea06424518290576c7647ae0717040586f9..41d5d15dfa2affdee68501efb2447a20
          this.maxPlayers = this.get("max-players", 20);
          this.networkCompressionThreshold = this.get("network-compression-threshold", 256);
          this.broadcastRconToOps = this.get("broadcast-rcon-to-ops", true);
-@@ -145,7 +145,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
+@@ -147,7 +147,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
          this.maxWorldSize = this.get("max-world-size", (integer) -> {
              return Mth.clamp(integer, 1, 29999984);
          }, 29999984);
 -        this.syncChunkWrites = this.get("sync-chunk-writes", true) && Boolean.getBoolean("Paper.enable-sync-chunk-writes"); // Paper - Hide sync chunk writes behind flag
-+        this.syncChunkWrites = this.get("sync-chunk-writes", false) && Boolean.getBoolean("Paper.enable-sync-chunk-writes"); // Paper - Hide sync chunk writes behind flag // Plazma - Show disabled by default
++        this.syncChunkWrites = Boolean.getBoolean("Paper.enable-sync-chunk-writes"); // Paper - Hide sync chunk writes behind flag // Plazma - Completely remove this setting
+         this.regionFileComression = this.get("region-file-compression", "deflate");
          this.enableJmxMonitoring = this.get("enable-jmx-monitoring", false);
          this.enableStatus = this.get("enable-status", true);
-         this.hideOnlinePlayers = this.get("hide-online-players", false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 30729e47d546b9bf18f15024516c2ebcb3b722e5..2d3f8bb3954d552d4bbcc9ec7286845a8d76da8a 100644
+index 655463a7d588ed88778d137b6fe5ac18951ff172..cc4762c13e21600b4c5e287a6fae9e6e472080b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -426,7 +426,7 @@ public final class CraftServer implements Server {
+@@ -449,7 +449,7 @@ public final class CraftServer implements Server {
  
          this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
          this.configuration.options().copyDefaults(true);
@@ -396,29 +365,41 @@ index 30729e47d546b9bf18f15024516c2ebcb3b722e5..2d3f8bb3954d552d4bbcc9ec7286845a
          if (!this.configuration.isString("aliases")) {
              legacyAlias = this.configuration.getConfigurationSection("aliases");
 diff --git a/src/main/java/org/plazmamc/plazma/Options.java b/src/main/java/org/plazmamc/plazma/Options.java
-index a858b7ddef7f6877c0b92f4150e0dd37bea121aa..eab5ea835a524482f8cc043c7be190a835335ed2 100644
+index 5d41bd4d4b86ca0c7c03d3ac6e75b3f1f1abe73b..c608770ea0df26859a09b794e93292f4aa6881b4 100644
 --- a/src/main/java/org/plazmamc/plazma/Options.java
 +++ b/src/main/java/org/plazmamc/plazma/Options.java
-@@ -3,5 +3,6 @@ package org.plazmamc.plazma;
+@@ -7,5 +7,6 @@ public interface Options {
- public interface Options {
  
-     boolean iKnowWhatIAmDoing = Boolean.getBoolean("Plazma.iKnowWhatIAmDoing");
+     boolean NO_OPTIMIZE = getBoolean("Plazma.disableConfigOptimization");
-+    boolean aggressiveOptimize = Boolean.getBoolean("Plazma.aggressiveOptimize");
+     boolean NO_WARN = getBoolean("Plazma.iKnowWhatIAmDoing");
++    boolean AGGRESSIVE = getBoolean("Plazma.aggressiveOptimize") && !NO_OPTIMIZE;
  
  }
+diff --git a/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java
+index 09053b4ccf268fd204c81dbb8d4f10fa9edcad5f..93f67f125b3674e645cfdae27e579e12d31a236e 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java
+@@ -35,6 +35,15 @@ public class PlazmaConfigurations extends Configurations<GlobalConfiguration, Wo
+     static final String WORLD_CONFIG_FILE_NAME = "plazma-world.yml";
+     static final boolean OPTIMIZE = !Options.NO_OPTIMIZE;
+ 
++    static {
++        if (Options.AGGRESSIVE) {
++            LOGGER.warn("Aggressive configuration optimization is enabled. It can greatly affect gameplay.");
++        } else if (OPTIMIZE) {
++            LOGGER.warn("Default configuration optimization is enabled. It may have some impact on gameplay.");
++            LOGGER.warn("To disable default configuration optimization, type \"-DPlazma.disableConfigOptimization\" before the -jar in the server startup command.");
++        }
++    }
++
+     private static final String HEADER_START = """
+             #### ENGLISH ####
+             This is the %s configuration file for Plazma.
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index a937993f318ef5703420f57fe65c5d990ce2c4dd..65b9e4fc073d0e97c6f90587d20e3ecbdaaf2c71 100644
+index 95cd1156766895546ef5574b33a60806bff08fa2..097f3c34d244b89e7dd9f8b6f2a3d8fdc67b36dc 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -49,6 +49,7 @@ public class PurpurConfig {
+@@ -244,7 +244,7 @@ public class PurpurConfig {
-             + "join us in our Discord guild.\n"
-             + "\n"
-             + "Website: https://purpurmc.org \n"
-+            + "Vanilla Food Properties: https://gist.github.com/BillyGalbreath/4fdfba991bd020e814eabf5143e3b225 \n" // Plazma
-             + "Docs: https://purpurmc.org/docs \n";
-     private static File CONFIG_FILE;
-     public static YamlConfiguration config;
-@@ -241,7 +242,7 @@ public class PurpurConfig {
          laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
      }
  
@@ -427,7 +408,7 @@ index a937993f318ef5703420f57fe65c5d990ce2c4dd..65b9e4fc073d0e97c6f90587d20e3ecb
      private static void useAlternateKeepAlive() {
          useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
      }
-@@ -486,7 +487,7 @@ public class PurpurConfig {
+@@ -491,7 +491,7 @@ public class PurpurConfig {
      }
  
      public static boolean useUPnP = false;
@@ -437,10 +418,10 @@ index a937993f318ef5703420f57fe65c5d990ce2c4dd..65b9e4fc073d0e97c6f90587d20e3ecb
      private static void networkSettings() {
          useUPnP = getBoolean("settings.network.upnp-port-forwarding", useUPnP);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 65ac86d07aeabb019132e180e5ed6b197e9ccad3..213559bdf83c5a07b4f7c0e32f425c2e17dc3db4 100644
+index 57ddb4e6a464567cc67e09ce06218cc25af4ddf9..e55993e318b7f7292e22c4539bc2fd1447f67fa8 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -425,7 +425,7 @@ public class PurpurWorldConfig {
+@@ -424,7 +424,7 @@ public class PurpurWorldConfig {
      public boolean idleTimeoutTargetPlayer = true;
      public String playerDeathExpDropEquation = "expLevel * 7";
      public int playerDeathExpDropMax = 100;
@@ -449,7 +430,7 @@ index 65ac86d07aeabb019132e180e5ed6b197e9ccad3..213559bdf83c5a07b4f7c0e32f425c2e
      public boolean teleportOnNetherCeilingDamage = false;
      public boolean totemOfUndyingWorksInInventory = false;
      public boolean playerFixStuckPortal = false;
-@@ -3133,7 +3133,7 @@ public class PurpurWorldConfig {
+@@ -3262,7 +3262,7 @@ public class PurpurWorldConfig {
      public boolean zombieJockeyOnlyBaby = true;
      public double zombieJockeyChance = 0.05D;
      public boolean zombieJockeyTryExistingChickens = true;
@@ -459,23 +440,23 @@ index 65ac86d07aeabb019132e180e5ed6b197e9ccad3..213559bdf83c5a07b4f7c0e32f425c2e
      public boolean zombieTakeDamageFromWater = false;
      public boolean zombieAlwaysDropExp = false;
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 1cf6d4f854d89c515e48e1fb365eb95ff9340765..7d1ae99e83dc6511838092c3ab6e0fd5f39faabc 100644
+index 2c408fa4abcbe1171c58aee8799c8cf7867d0f0a..aadad0a1e3c7e20b0ab97095ee6e6fb7dbfbd234 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -150,14 +150,14 @@ public class SpigotWorldConfig
      public double itemMerge;
      private void itemMerge()
      {
--        this.itemMerge = this.getDouble("merge-radius.item", 2.5 );
+-        this.itemMerge = this.getDouble("merge-radius.item", 0.5 );
-+        this.itemMerge = this.getDouble("merge-radius.item", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 3.5 : 2.5 ); // Plazma - Optimize default configurations
++        this.itemMerge = this.getDouble("merge-radius.item", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 3.5 : 0.5); // Plazma - Optimize default configurations
          this.log( "Item Merge Radius: " + this.itemMerge );
      }
  
      public double expMerge;
      private void expMerge()
      {
--        this.expMerge = this.getDouble("merge-radius.exp", 3.0 );
+-        this.expMerge = this.getDouble("merge-radius.exp", -1 );
-+        this.expMerge = this.getDouble("merge-radius.exp", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 4.0 : 3.0 ); // Plazma - Optimize default configurations
++        this.expMerge = this.getDouble("merge-radius.exp", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 4.0 : -1); // Plazma - Optimize default configurations
          this.log( "Experience Merge Radius: " + this.expMerge );
      }
  
@@ -488,47 +469,58 @@ index 1cf6d4f854d89c515e48e1fb365eb95ff9340765..7d1ae99e83dc6511838092c3ab6e0fd5
          this.log( "Mob Spawn Range: " + this.mobSpawnRange );
      }
  
-@@ -207,26 +207,26 @@ public class SpigotWorldConfig
+@@ -207,27 +207,29 @@ public class SpigotWorldConfig
          this.log( "Item Despawn Rate: " + this.itemDespawnRate );
      }
  
 -    public int animalActivationRange = 32;
 -    public int monsterActivationRange = 32;
-+    public int animalActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 16 : 32; // Plazma - Optimize default configurations
+-    public int raiderActivationRange = 64;
-+    public int monsterActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 24 : 32; // Plazma - Optimize default configurations
-     public int raiderActivationRange = 48;
 -    public int miscActivationRange = 16;
-+    public int miscActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 8 : 16; // Plazma - Optimize default configurations
+-    // Paper start
-     // Paper start
 -    public int flyingMonsterActivationRange = 32;
 -    public int waterActivationRange = 16;
 -    public int villagerActivationRange = 32;
-+    public int flyingMonsterActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 48 : 32; // Plazma - Optimize default configurations
+-    public int wakeUpInactiveAnimals = 4;
-+    public int waterActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 8 : 16; // Plazma - Optimize default configurations
+-    public int wakeUpInactiveAnimalsEvery = 60*20;
-+    public int villagerActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 16 : 32; // Plazma - Optimize default configurations
-     public int wakeUpInactiveAnimals = 4;
-     public int wakeUpInactiveAnimalsEvery = 60*20;
 -    public int wakeUpInactiveAnimalsFor = 5*20;
 -    public int wakeUpInactiveMonsters = 8;
-+    public int wakeUpInactiveAnimalsFor = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 40 : 100; // Plazma - Optimize default configurations
+-    public int wakeUpInactiveMonstersEvery = 20*20;
-+    public int wakeUpInactiveMonsters = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 4 : 8; // Plazma - Optimize default configurations
-     public int wakeUpInactiveMonstersEvery = 20*20;
 -    public int wakeUpInactiveMonstersFor = 5*20;
 -    public int wakeUpInactiveVillagers = 4;
-+    public int wakeUpInactiveMonstersFor = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 60 : 100; // Plazma - Optimize default configurations
+-    public int wakeUpInactiveVillagersEvery = 30*20;
-+    public int wakeUpInactiveVillagers = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 1 : 4; // Plazma - Optimize default configurations
-     public int wakeUpInactiveVillagersEvery = 30*20;
 -    public int wakeUpInactiveVillagersFor = 5*20;
 -    public int wakeUpInactiveFlying = 8;
-+    public int wakeUpInactiveVillagersFor = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 20 : 100; // Plazma - Optimize default configurations
+-    public int wakeUpInactiveFlyingEvery = 10*20;
-+    public int wakeUpInactiveFlying = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 1 : 8; // Plazma - Optimize default configurations
-     public int wakeUpInactiveFlyingEvery = 10*20;
 -    public int wakeUpInactiveFlyingFor = 5*20;
-+    public int wakeUpInactiveFlyingFor = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 60 : 100; // Plazma - Optimize default configurations
+-    public int villagersWorkImmunityAfter = 5*20;
-     public int villagersWorkImmunityAfter = 5*20;
++    // Plazma start - Optimize default configurations
++    public int animalActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 16 : 32;
++    public int monsterActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 24 : 32;
++    public int raiderActivationRange = 64; // diff on changes
++    public int miscActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 8 : 16;
++    // Paper start // diff on changes
++    public int flyingMonsterActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 48 : 32;
++    public int waterActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 8 : 16;
++    public int villagerActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 16 : 32;
++    public int wakeUpInactiveAnimals = 4; // diff on changes
++    public int wakeUpInactiveAnimalsEvery = 1200;
++    public int wakeUpInactiveAnimalsFor = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 40 : 100;
++    public int wakeUpInactiveMonsters = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 4 : 8;
++    public int wakeUpInactiveMonstersEvery = 400;
++    public int wakeUpInactiveMonstersFor = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 60 : 100;
++    public int wakeUpInactiveVillagers = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 1 : 4;
++    public int wakeUpInactiveVillagersEvery = 600;
++    public int wakeUpInactiveVillagersFor = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 20 : 100;
++    public int wakeUpInactiveFlying = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 1 : 8;
++    public int wakeUpInactiveFlyingEvery = 200;
++    public int wakeUpInactiveFlyingFor = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 60 : 100;
++    public int villagersWorkImmunityAfter = 100;
++    // Plazma end - Optimize default configurations
      public int villagersWorkImmunityFor = 20;
      public boolean villagersActiveForPanic = true;
-@@ -299,7 +299,7 @@ public class SpigotWorldConfig
+     // Paper end
+@@ -299,7 +301,7 @@ public class SpigotWorldConfig
          {
              this.set( "ticks-per.hopper-check", 1 );
          }
@@ -537,7 +529,7 @@ index 1cf6d4f854d89c515e48e1fb365eb95ff9340765..7d1ae99e83dc6511838092c3ab6e0fd5
          this.hopperAmount = this.getInt( "hopper-amount", 1 );
          this.hopperCanLoadChunks = this.getBoolean( "hopper-can-load-chunks", false );
          this.log( "Hopper Transfer: " + this.hopperTransfer + " Hopper Check: " + this.hopperCheck + " Hopper Amount: " + this.hopperAmount + " Hopper Can Load Chunks: " + this.hopperCanLoadChunks );
-@@ -309,7 +309,7 @@ public class SpigotWorldConfig
+@@ -309,7 +311,7 @@ public class SpigotWorldConfig
      public int tridentDespawnRate;
      private void arrowDespawnRate()
      {

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

@@ -0,0 +1,196 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Wed, 15 May 2024 16:13:17 +0900
+Subject: [PATCH] Add an option to apply the configuration to the vanilla
+ default
+
+
+diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+index a8e75eaadfcc6c8b2503776d7de197f756712819..99cf08bc17eec05463b300c0c9fd108cbfba1b8f 100644
+--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
++++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+@@ -87,7 +87,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+             public Component flyingVehicle = Component.translatable("multiplayer.disconnect.flying");
+         }
+ 
+-        public Component noPermission = Component.text("I'm sorry, but you do not have permission to perform this command. Please contact the server administrators if you believe that this is in error.", NamedTextColor.RED);
++        public Component noPermission = org.plazmamc.plazma.Options.VANILLAIZE ? Component.translatable("command.unknown.command") : Component.text("I'm sorry, but you do not have permission to perform this command. Please contact the server administrators if you believe that this is in error.", NamedTextColor.RED);
+         public boolean useDisplayNameInQuitMessage = false;
+     }
+ 
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+index cc4762c13e21600b4c5e287a6fae9e6e472080b3..76f255d12189ffe83426cc7aa85771d5c7cfb111 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -449,7 +449,19 @@ public final class CraftServer implements Server {
+ 
+         this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
+         this.configuration.options().copyDefaults(true);
+-        this.configuration.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream(org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? "configurations/bukkit_optimized.yml" : "configurations/bukkit.yml"), Charsets.UTF_8))); // Plazma - Optimize default configurations
++        // Plazma start - Add an option to apply the configuration to the vanilla default
++        String configPath;
++        if (org.plazmamc.plazma.Options.NO_OPTIMIZE) {
++            if (org.plazmamc.plazma.Options.VANILLAIZE) configPath = "configurations/bukkit_vanillaized.yml";
++            else configPath = "configurations/bukkit.yml";
++        } else {
++            if (org.plazmamc.plazma.Options.VANILLAIZE) configPath = "configurations/bukkit_optimized_vanillaized.yml";
++            else configPath = "configurations/bukkit_optimized.yml";
++        }
++        this.configuration.setDefaults(YamlConfiguration.loadConfiguration(
++            new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream(configPath), Charsets.UTF_8)
++        )); // Plazma - Optimize default configurations
++        // Plazma end - Add an option to apply the configuration to the vanilla default
+         ConfigurationSection legacyAlias = null;
+         if (!this.configuration.isString("aliases")) {
+             legacyAlias = this.configuration.getConfigurationSection("aliases");
+diff --git a/src/main/java/org/plazmamc/plazma/Options.java b/src/main/java/org/plazmamc/plazma/Options.java
+index c608770ea0df26859a09b794e93292f4aa6881b4..063b71b3043a69a90130a81686b6a5f1e5f22fd1 100644
+--- a/src/main/java/org/plazmamc/plazma/Options.java
++++ b/src/main/java/org/plazmamc/plazma/Options.java
+@@ -8,5 +8,7 @@ public interface Options {
+     boolean NO_OPTIMIZE = getBoolean("Plazma.disableConfigOptimization");
+     boolean NO_WARN = getBoolean("Plazma.iKnowWhatIAmDoing");
+     boolean AGGRESSIVE = getBoolean("Plazma.aggressiveOptimize") && !NO_OPTIMIZE;
++    boolean VANILLAIZE = getBoolean("Plazma.vanillaize") && !AGGRESSIVE;
++    boolean USE_VANILLA = getBoolean("Plazma.useVanillaConfiguration") && !AGGRESSIVE && NO_OPTIMIZE;
+ 
+ }
+diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
+index 4dbb109d0526afee99b9190fc256585121aac9b5..3835a7aa3e3c60a6f50f1d6e781f280ea8a83fb3 100644
+--- a/src/main/java/org/spigotmc/SpigotConfig.java
++++ b/src/main/java/org/spigotmc/SpigotConfig.java
+@@ -193,8 +193,8 @@ public class SpigotConfig
+     public static String whitelistMessage;
+     public static String unknownCommandMessage;
+     public static String serverFullMessage;
+-    public static String outdatedClientMessage = "Outdated client! Please use {0}";
+-    public static String outdatedServerMessage = "Outdated server! I\'m still on {0}";
++    public static String outdatedClientMessage = org.plazmamc.plazma.Options.VANILLAIZE ? "<lang:multiplayer.disconnect.outdated_client>" : "Outdated client! Please use {0}";
++    public static String outdatedServerMessage = org.plazmamc.plazma.Options.VANILLAIZE ? "<lang:multiplayer.disconnect.outdated_server>" : "Outdated server! I'm still on {0}";
+     private static String transform(String s)
+     {
+         return ChatColor.translateAlternateColorCodes( '&', s ).replaceAll( "\\\\n", "\n" );
+@@ -207,9 +207,9 @@ public class SpigotConfig
+             SpigotConfig.set( "messages.outdated-server", SpigotConfig.outdatedServerMessage );
+         }
+ 
+-        SpigotConfig.whitelistMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.whitelist", "You are not whitelisted on this server!" ) );
+-        SpigotConfig.unknownCommandMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.unknown-command", "Unknown command. Type \"/help\" for help." ) );
+-        SpigotConfig.serverFullMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.server-full", "The server is full!" ) );
++        SpigotConfig.whitelistMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.whitelist", org.plazmamc.plazma.Options.VANILLAIZE ? "<lang:multiplayer.disconnect.not_whitelisted>" : "You are not whitelisted on this server!" ) ); // Plazma - Add an option to apply the configuration to the vanilla default
++        SpigotConfig.unknownCommandMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.unknown-command", org.plazmamc.plazma.Options.VANILLAIZE ? "<lang:command.unknown.command>" : "Unknown command. Type \"/help\" for help." ) );
++        SpigotConfig.serverFullMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.server-full", org.plazmamc.plazma.Options.VANILLAIZE ? "<lang:multiplayer.disconnect.server_full>" : "The server is full!" ) );
+         SpigotConfig.outdatedClientMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.outdated-client", SpigotConfig.outdatedClientMessage ) );
+         SpigotConfig.outdatedServerMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.outdated-server", SpigotConfig.outdatedServerMessage ) );
+     }
+@@ -223,7 +223,7 @@ public class SpigotConfig
+         SpigotConfig.timeoutTime = SpigotConfig.getInt( "settings.timeout-time", SpigotConfig.timeoutTime );
+         SpigotConfig.restartOnCrash = SpigotConfig.getBoolean( "settings.restart-on-crash", SpigotConfig.restartOnCrash );
+         SpigotConfig.restartScript = SpigotConfig.getString( "settings.restart-script", SpigotConfig.restartScript );
+-        SpigotConfig.restartMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.restart", "Server is restarting" ) );
++        SpigotConfig.restartMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.restart", org.plazmamc.plazma.Options.VANILLAIZE ? "<lang:disconnect.quitting>" : "Server is restarting" ) );
+         SpigotConfig.commands.put( "restart", new RestartCommand( "restart" ) );
+         // WatchdogThread.doStart( SpigotConfig.timeoutTime, SpigotConfig.restartOnCrash ); // Paper - moved to after paper config initialization
+     }
+diff --git a/src/main/resources/configurations/bukkit_optimized_vanillaized.yml b/src/main/resources/configurations/bukkit_optimized_vanillaized.yml
+new file mode 100644
+index 0000000000000000000000000000000000000000..b7ed456b0172caebdf5b548052ff2ae688377020
+--- /dev/null
++++ b/src/main/resources/configurations/bukkit_optimized_vanillaized.yml
+@@ -0,0 +1,45 @@
++# This is the main configuration file for Bukkit.
++# As you can see, there's actually not that much to configure without any plugins.
++# For a reference for any variable inside this file, check out the Bukkit Wiki at
++# https://www.spigotmc.org/go/bukkit-yml
++# 
++# If you need help on this file, feel free to join us on Discord or leave a message
++# on the forums asking for advice.
++# 
++# Discord: https://www.spigotmc.org/go/discord
++# Forums: https://www.spigotmc.org/
++# Bug tracker: https://www.spigotmc.org/go/bugs
++
++
++settings:
++    allow-end: true
++    warn-on-overload: true
++    permissions-file: permissions.yml
++    update-folder: update
++    plugin-profiling: false
++    connection-throttle: 4000
++    query-plugins: true
++    deprecated-verbose: default
++    shutdown-message: <lang:multiplayer.disconnect.server_shutdown>
++    minimum-api: none
++    use-map-color-cache: true
++spawn-limits:
++    monsters: 20
++    animals: 5
++    water-animals: 2
++    water-ambient: 2
++    water-underground-creature: 3
++    axolotls: 3
++    ambient: 1
++chunk-gc:
++    period-in-ticks: 400
++ticks-per:
++    animal-spawns: 400
++    monster-spawns: 10
++    water-spawns: 400
++    water-ambient-spawns: 400
++    water-underground-creature-spawns: 400
++    axolotl-spawns: 400
++    ambient-spawns: 400
++    autosave: 6000
++aliases: now-in-commands.yml
+diff --git a/src/main/resources/configurations/bukkit_vanillaized.yml b/src/main/resources/configurations/bukkit_vanillaized.yml
+new file mode 100644
+index 0000000000000000000000000000000000000000..22fe392b9970bb82db293d638b0dd5727bd60e5a
+--- /dev/null
++++ b/src/main/resources/configurations/bukkit_vanillaized.yml
+@@ -0,0 +1,45 @@
++# This is the main configuration file for Bukkit.
++# As you can see, there's actually not that much to configure without any plugins.
++# For a reference for any variable inside this file, check out the Bukkit Wiki at
++# https://www.spigotmc.org/go/bukkit-yml
++# 
++# If you need help on this file, feel free to join us on Discord or leave a message
++# on the forums asking for advice.
++# 
++# Discord: https://www.spigotmc.org/go/discord
++# Forums: https://www.spigotmc.org/
++# Bug tracker: https://www.spigotmc.org/go/bugs
++
++
++settings:
++    allow-end: true
++    warn-on-overload: true
++    permissions-file: permissions.yml
++    update-folder: update
++    plugin-profiling: false
++    connection-throttle: 4000
++    query-plugins: true
++    deprecated-verbose: default
++    shutdown-message: <lang:multiplayer.disconnect.server_shutdown>
++    minimum-api: none
++    use-map-color-cache: true
++spawn-limits:
++    monsters: 70
++    animals: 10
++    water-animals: 5
++    water-ambient: 20
++    water-underground-creature: 5
++    axolotls: 5
++    ambient: 15
++chunk-gc:
++    period-in-ticks: 600
++ticks-per:
++    animal-spawns: 400
++    monster-spawns: 1
++    water-spawns: 1
++    water-ambient-spawns: 1
++    water-underground-creature-spawns: 1
++    axolotl-spawns: 1
++    ambient-spawns: 1
++    autosave: 6000
++aliases: now-in-commands.yml

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

@@ -5,10 +5,10 @@ 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 b7709cbb1a78eb1daac2112cb9fbf5d379aaa662..2a73508dd8a59c6af8b65ab2db97b6e20b104c57 100644
+index d4a9b187b01c63342d9b05b5c29bb1d199deed6c..38752c9ba1726e3c38dd758287a920bc476ef88a 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -180,16 +180,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -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\"");
          }
  
@@ -25,13 +25,12 @@ index b7709cbb1a78eb1daac2112cb9fbf5d379aaa662..2a73508dd8a59c6af8b65ab2db97b6e2
          DedicatedServer.LOGGER.info("Loading properties");
          DedicatedServerProperties dedicatedserverproperties = this.settings.getProperties();
  
-@@ -212,6 +202,17 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -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
-+        // Plazma - Tweak console logging; Moved down
++        // Paper start - detect running as root // Plazma - Tweak console logging (moved down)
-+        // Paper start - detect running as root
++        if (io.papermc.paper.util.ServerEnvironment.userIsRootOrAdmin()) {
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().consoleLogs.rootUserWarnings && 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.");
@@ -39,11 +38,10 @@ index b7709cbb1a78eb1daac2112cb9fbf5d379aaa662..2a73508dd8a59c6af8b65ab2db97b6e2
 +            DedicatedServer.LOGGER.warn("****************************");
 +        }
 +        // Paper end - detect running as root
-+        // Plazma end - Tweak console logging
+         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()) {
-             this.getProfileCache().save(false); // Paper
+@@ -335,6 +334,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-@@ -320,6 +321,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
@@ -51,7 +49,7 @@ index b7709cbb1a78eb1daac2112cb9fbf5d379aaa662..2a73508dd8a59c6af8b65ab2db97b6e2
          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.");
-@@ -333,7 +335,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -348,7 +348,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
@@ -61,25 +59,26 @@ index b7709cbb1a78eb1daac2112cb9fbf5d379aaa662..2a73508dd8a59c6af8b65ab2db97b6e2
  
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ac1e0c66f167218306504db6037cc1d6509072a0..ef4b1fb1532e1939d9a7e5337edc80b334b78318 100644
+index 16999fa20c3621e016d1b0fadfb76f2fe03a2a69..8d7d050f12df83931bbb32f1832d7fcbc06317da 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1468,6 +1468,7 @@ public abstract class PlayerList {
+@@ -1426,6 +1426,7 @@ public abstract class PlayerList {
-     public void broadcastChatMessage(PlayerChatMessage message, Predicate<ServerPlayer> shouldSendFiltered, @Nullable ServerPlayer sender, ChatType.Bound params, @Nullable Function<net.kyori.adventure.audience.Audience, Component> unsignedFunction) {
+     }
-         // Paper end
+ 
-         boolean flag = this.verifyChatTrusted(message);
+     public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public
-+        flag = flag || org.plazmamc.plazma.configurations.GlobalConfiguration.get().consoleLogs.notSecurePrefix; // Plazma - Tweak console logging
++        if (!org.plazmamc.plazma.configurations.GlobalConfiguration.get().consoleLogs.notSecurePrefix) return true; // Plazma - Tweak console logging
+         return message.hasSignature() && !message.hasExpiredServer(Instant.now());
+     }
  
-         this.server.logChatMessage((unsignedFunction == null ? message.decoratedContent() : unsignedFunction.apply(this.server.console)), params, flag ? null : "Not Secure"); // Paper
-         OutgoingChatMessage outgoingchatmessage = OutgoingChatMessage.create(message);
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 2adaa7c6433ac3f54c9d75ee3c14772b4c538418..294fdbba44191427a841f8ac82b18ed8d706f53e 100644
+index 35d5bd2f7dba1aa74547b6ae994bc84a56911bf2..e153370e617e63a8e497036c93ea55dfe851bc6e 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -67,4 +67,13 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -79,4 +79,14 @@ public class GlobalConfiguration extends ConfigurationPart {
  
      }
  
++
 +    public ConsoleLogs consoleLogs;
 +    public class ConsoleLogs extends ConfigurationPart {
 +

patches/server/0015-Add-missing-Pufferfish-configurations.patch

@@ -0,0 +1,62 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Fri, 13 Dec 2024 13:08:37 +0900
+Subject: [PATCH] Add missing Pufferfish configurations
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+index 9ef53608f1608e88de7a7b3e96b43d8d2b4230ae..8500ac473581b90036578d66243c5313e2ce3ddf 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
++++ b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+@@ -161,11 +161,13 @@ public class Armadillo extends Animal {
+         return ArmadilloAi.makeBrain(this.brainProvider().makeBrain(dynamic));
+     }
+ 
++    private int behaviorTick; // Plazma - Add missing pufferfish configurations
+     @Override
+     protected void customServerAiStep(ServerLevel world) {
+         ProfilerFiller gameprofilerfiller = Profiler.get();
+ 
+         gameprofilerfiller.push("armadilloBrain");
++        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Plazma - Add missing pufferfish configurations
+         ((Brain<Armadillo>) this.brain).tick(world, this); // CraftBukkit - decompile error
+         gameprofilerfiller.pop();
+         gameprofilerfiller.push("armadilloActivityUpdate");
+diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+index dbce71f45c008da883b6d244a06343d83ae25e7e..d2f0b14a0014802605b601e62d0eebddf06d3737 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
++++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+@@ -152,6 +152,7 @@ public class Camel extends AbstractHorse {
+         return pose == Pose.SITTING ? Camel.SITTING_DIMENSIONS.scale(this.getAgeScale()) : super.getDefaultDimensions(pose);
+     }
+ 
++    private int behaviorTick = 0; // Plazma - Add missing pufferfish configurations
+     @Override
+     protected void customServerAiStep(ServerLevel world) {
+         ProfilerFiller gameprofilerfiller = Profiler.get();
+@@ -159,6 +160,7 @@ public class Camel extends AbstractHorse {
+         gameprofilerfiller.push("camelBrain");
+         Brain<Camel> behaviorcontroller = (Brain<Camel>) this.getBrain(); // CraftBukkit - decompile error
+ 
++        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Plazma - Add missing pufferfish configurations
+         behaviorcontroller.tick(world, this);
+         gameprofilerfiller.pop();
+         gameprofilerfiller.push("camelActivityUpdate");
+diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+index 464a16df15d8759d66f94ad080d1ea28b3f6474c..6061cd4fc38fef0895571ab767e495d5755f9fc8 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
++++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+@@ -493,11 +493,13 @@ public class Sniffer extends Animal {
+         return Brain.provider(SnifferAi.MEMORY_TYPES, SnifferAi.SENSOR_TYPES);
+     }
+ 
++    private int behaviorTick; // Plazma - Add missing pufferfish configurations
+     @Override
+     protected void customServerAiStep(ServerLevel world) {
+         ProfilerFiller gameprofilerfiller = Profiler.get();
+ 
+         gameprofilerfiller.push("snifferBrain");
++        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Plazma - Add missing pufferfish configurations
+         this.getBrain().tick(world, this);
+         gameprofilerfiller.popPush("snifferActivityUpdate");
+         SnifferAi.updateActivity(this);

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

@@ -1,16 +1,16 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
 Date: Sat, 25 Mar 2023 00:52:11 +0900
-Subject: [PATCH] Add missing purpur configuration options
+Subject: [PATCH] Add missing Purpur configuration options
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-index c783ce59ea766e6c46a3313628b961f27e01ee8b..8adcffc1e6434e06ca52d119a7326a1272897307 100644
+index 0a173040c56fea6d8f83998b7c66aa8daaf648f2..16b98cad477d7af2d9534cc189aae43a5adc8d58 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-@@ -150,6 +150,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
+@@ -160,6 +160,18 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
-     protected void registerGoals() {
+         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.allayMaxHealth);
-         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
+         this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.allayScale);
      }
 +
 +    // Plazma start - Add missing purpur configuration options
@@ -23,20 +23,15 @@ index c783ce59ea766e6c46a3313628b961f27e01ee8b..8adcffc1e6434e06ca52d119a7326a12
 +    public boolean isAlwaysExperienceDropper() {
 +        return level().purpurConfig.allayAlwaysDropExp;
 +    }
-+
-+    @Override
-+    public void initAttributes() {
-+        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level().purpurConfig.allayMaxHealth);
-+    }
 +    // Plazma end - Add missing purpur configuration options
      // Purpur end
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 41773acc8e8e27daa1fe43726939b2d95da92c30..7574da6cb1844305f965f9725c7d8cb91c92cbd7 100644
+index d2f0b14a0014802605b601e62d0eebddf06d3737..459a45f82c42b346a66bb1954e155a0970dcc30f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -95,6 +95,18 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+@@ -96,6 +96,18 @@ public class Camel extends AbstractHorse {
      public int getPurpurBreedTime() {
          return this.level().purpurConfig.camelBreedingTicks;
      }
@@ -56,10 +51,10 @@ index 41773acc8e8e27daa1fe43726939b2d95da92c30..7574da6cb1844305f965f9725c7d8cb9
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-index d6340d0a1308bafd3ba176562bf08dcadec02b34..e079f0994c81561510e5d223d2203e349daf07e1 100644
+index 02581f47d1ca58c2b8abffc478adf48343585c8b..bd04af6311ca64d81c8829e731ac39a6486ee789 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-@@ -136,6 +136,23 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
+@@ -163,6 +163,23 @@ public class Frog extends Animal implements VariantHolder<Holder<FrogVariant>> {
      public float getJumpPower() {
          return (getRider() != null && isControllable()) ? level().purpurConfig.frogRidableJumpHeight * this.getBlockJumpFactor() : super.getJumpPower();
      }
@@ -84,10 +79,10 @@ index d6340d0a1308bafd3ba176562bf08dcadec02b34..e079f0994c81561510e5d223d2203e34
  
      public int getPurpurBreedTime() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-index 2a9c2a69a0589e4e7b7c79d3716376b360a2eba1..630eaae555403db79f4e16880ca443904b9254ab 100644
+index 7e92e8c4fec36c8838604f17cf366cc80e82b19b..1b0e80ae62b5c5d4e1fcac71b90f83f12fe4878a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-@@ -90,6 +90,23 @@ public class Tadpole extends AbstractFish {
+@@ -93,6 +93,23 @@ public class Tadpole extends AbstractFish {
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
      }
@@ -112,12 +107,12 @@ index 2a9c2a69a0589e4e7b7c79d3716376b360a2eba1..630eaae555403db79f4e16880ca44390
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index 5e7d76dcdc170b809ab82f6e2259c9b4d3d741be..24e351b40745d15e065f4c3cd904596c6daf4cfb 100644
+index 6061cd4fc38fef0895571ab767e495d5755f9fc8..0bc7856065fdc599890f18f5a4e2f6c2b3d94ba7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-@@ -106,6 +106,18 @@ public class Sniffer extends Animal {
+@@ -116,6 +116,18 @@ public class Sniffer extends Animal {
-     public boolean isControllable() {
+     public int getPurpurBreedTime() {
-         return level().purpurConfig.snifferControllable;
+         return this.level().purpurConfig.snifferBreedingTicks;
      }
 +
 +    // Plazma start - Add missing purpur configuration options
@@ -135,10 +130,10 @@ index 5e7d76dcdc170b809ab82f6e2259c9b4d3d741be..24e351b40745d15e065f4c3cd904596c
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index bf7ef72a7d92db8f11789a69583270644de0dac7..1f476a4fd148ac9a4c9ad5d12de46a16e4116239 100644
+index 5a62fe9c4f0cee9e8b4a48564f76afec609335b1..79b090030b716029cc4cfc8bf9d81af0b2202313 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-@@ -147,6 +147,23 @@ public class Warden extends Monster implements VibrationSystem {
+@@ -151,6 +151,23 @@ public class Warden extends Monster implements VibrationSystem {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
      }
@@ -162,20 +157,29 @@ index bf7ef72a7d92db8f11789a69583270644de0dac7..1f476a4fd148ac9a4c9ad5d12de46a16
      // Purpur end
  
      @Override
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
+@@ -305,7 +322,7 @@ public class Warden extends Monster implements VibrationSystem {
-index 58af87b8faf4f8d6bdb111c49a429466acface68..22cc678f9bd39acc27ba2d2e7981f9e8026440d4 100644
+         ProfilerFiller gameprofilerfiller = Profiler.get();
---- a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
-@@ -43,7 +43,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
  
-     public ChestBoat(EntityType<? extends Boat> type, Level world) {
+         gameprofilerfiller.push("wardenBrain");
-         super(type, world);
+-        if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
++        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Plazma - Add missing Purpur configurations
+         this.getBrain().tick(world, this);
+         gameprofilerfiller.pop();
+         super.customServerAiStep(world);
+diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractChestBoat.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractChestBoat.java
+index 1f4cc08e84a23213bb9786ea09ad77caeec2d336..f888f1dd2e3c228b0a370fe920b63d547bbba571 100644
+--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractChestBoat.java
++++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractChestBoat.java
+@@ -46,7 +46,7 @@ public abstract class AbstractChestBoat extends AbstractBoat implements HasCusto
+ 
+     public AbstractChestBoat(EntityType<? extends AbstractChestBoat> type, Level world, Supplier<Item> itemSupplier) {
+         super(type, world, itemSupplier);
 -        this.itemStacks = NonNullList.withSize(27, ItemStack.EMPTY);
 +        this.itemStacks = NonNullList.withSize(org.purpurmc.purpur.PurpurConfig.chestBoatRows * 9, ItemStack.EMPTY); // Plazma - Add missing purpur configuration options
      }
  
-     public ChestBoat(Level world, double d0, double d1, double d2) {
+     @Override
-@@ -170,7 +170,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
+@@ -142,7 +142,7 @@ public abstract class AbstractChestBoat extends AbstractBoat implements HasCusto
  
      @Override
      public int getContainerSize() {
@@ -185,10 +189,10 @@ index 58af87b8faf4f8d6bdb111c49a429466acface68..22cc678f9bd39acc27ba2d2e7981f9e8
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 65b9e4fc073d0e97c6f90587d20e3ecbdaaf2c71..fc48ff9270e32c3b3dbf7ffd310cab7c33d459c0 100644
+index 097f3c34d244b89e7dd9f8b6f2a3d8fdc67b36dc..3f4c94aada930e55dfe6a2dd6f3bfb51b2276b0d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -329,6 +329,7 @@ public class PurpurConfig {
+@@ -331,6 +331,7 @@ public class PurpurConfig {
      }
  
      public static int barrelRows = 3;
@@ -196,7 +200,7 @@ index 65b9e4fc073d0e97c6f90587d20e3ecbdaaf2c71..fc48ff9270e32c3b3dbf7ffd310cab7c
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
      public static boolean cryingObsidianValidForPortalFrame = false;
-@@ -369,6 +370,7 @@ public class PurpurConfig {
+@@ -373,6 +374,7 @@ public class PurpurConfig {
              case 1 -> 9;
              default -> 27;
          });
@@ -205,42 +209,38 @@ index 65b9e4fc073d0e97c6f90587d20e3ecbdaaf2c71..fc48ff9270e32c3b3dbf7ffd310cab7c
          org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
          enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 213559bdf83c5a07b4f7c0e32f425c2e17dc3db4..c7d8f22ecaf22232aef015da5a330dc39db4b695 100644
+index e55993e318b7f7292e22c4539bc2fd1447f67fa8..b67b6147e9175041539b01357dd8b1e94cfd6841 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1180,7 +1180,15 @@ public class PurpurWorldConfig {
+@@ -1135,7 +1135,13 @@ public class PurpurWorldConfig {
-     public boolean allayRidableInWater = true;
      public boolean allayControllable = true;
-     public List<String> allayRespectNBT = new ArrayList<>();
+     public double allayMaxHealth = 20.0D;
+     public double allayScale = 1.0D;
 +    // Plazma start - Add missing purpur config options
-+    public double allayMaxHealth = 20.0D;
 +    public boolean allayTakeDamageFromWater = false;
 +    public boolean allayAlwaysDropExp = false;
      private void allaySettings() {
-+        allayMaxHealth = getDouble("mobs.allay.max-health", allayMaxHealth);
 +        allayTakeDamageFromWater = getBoolean("mobs.allay.take-damage-from-water", allayTakeDamageFromWater);
 +        allayAlwaysDropExp = getBoolean("mobs.allay.always-drop-exp", allayAlwaysDropExp);
 +    // Plazma end - Add missing purpur configuration options
          allayRidable = getBoolean("mobs.allay.ridable", allayRidable);
          allayRidableInWater = getBoolean("mobs.allay.ridable-in-water", allayRidableInWater);
          allayControllable = getBoolean("mobs.allay.controllable", allayControllable);
-@@ -1299,7 +1307,15 @@ public class PurpurWorldConfig {
+@@ -1290,7 +1296,13 @@ public class PurpurWorldConfig {
      public double camelMovementSpeedMin = 0.09D;
      public double camelMovementSpeedMax = 0.09D;
      public int camelBreedingTicks = 6000;
 +    // Plazma start - Add missing purpur config options
-+    //public boolean camelRidableInWater = false;
 +    public boolean camelTakeDamageFromWater = false;
 +    public boolean camelAlwaysDropExp = false;
      private void camelSettings() {
-+        //camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater);
 +        camelTakeDamageFromWater = getBoolean("mobs.camel.takes-damage-from-water", camelTakeDamageFromWater);
 +        camelAlwaysDropExp = getBoolean("mobs.camel.always-drop-exp", camelAlwaysDropExp);
 +    // Plazma end - Add missing purpur configuration options
          camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater);
          camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin);
          camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax);
-@@ -1727,7 +1743,15 @@ public class PurpurWorldConfig {
+@@ -1755,7 +1767,15 @@ public class PurpurWorldConfig {
      public boolean frogControllable = true;
      public float frogRidableJumpHeight = 0.65F;
      public int frogBreedingTicks = 6000;
@@ -256,9 +256,9 @@ index 213559bdf83c5a07b4f7c0e32f425c2e17dc3db4..c7d8f22ecaf22232aef015da5a330dc3
          frogRidable = getBoolean("mobs.frog.ridable", frogRidable);
          frogRidableInWater = getBoolean("mobs.frog.ridable-in-water", frogRidableInWater);
          frogControllable = getBoolean("mobs.frog.controllable", frogControllable);
-@@ -2678,7 +2702,13 @@ public class PurpurWorldConfig {
+@@ -2767,7 +2787,13 @@ public class PurpurWorldConfig {
-     public boolean snifferControllable = true;
      public double snifferMaxHealth = 14.0D;
+     public double snifferScale = 1.0D;
      public int snifferBreedingTicks = 6000;
 +    // Plazma start - Add missing purpur config options
 +    public boolean snifferTakeDamageFromWater = false;
@@ -270,7 +270,7 @@ index 213559bdf83c5a07b4f7c0e32f425c2e17dc3db4..c7d8f22ecaf22232aef015da5a330dc3
          snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable);
          snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater);
          snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable);
-@@ -2777,7 +2807,15 @@ public class PurpurWorldConfig {
+@@ -2875,7 +2901,15 @@ public class PurpurWorldConfig {
      public boolean tadpoleRidable = false;
      public boolean tadpoleRidableInWater = true;
      public boolean tadpoleControllable = true;
@@ -286,7 +286,7 @@ index 213559bdf83c5a07b4f7c0e32f425c2e17dc3db4..c7d8f22ecaf22232aef015da5a330dc3
          tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable);
          tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater);
          tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable);
-@@ -2989,7 +3027,15 @@ public class PurpurWorldConfig {
+@@ -3107,7 +3141,15 @@ public class PurpurWorldConfig {
      public boolean wardenRidable = false;
      public boolean wardenRidableInWater = true;
      public boolean wardenControllable = true;

patches/server/0016-Add-some-missing-Pufferfish-configurations.patch

@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 27 Sep 2023 18:29:51 +0900
-Subject: [PATCH] Add some missing Pufferfish configurations
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 61d4a78bde54dd90fc7a207f88709be25593c9f4..ef09fae1a46f4b37adfad059b0accb80845c8b7c 100644
---- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -168,10 +168,12 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
-         return dimensions.height - 0.1F * this.getScale();
-     }
- 
-+    private int behaviorTick = 0; // Plazma - Add missing pufferfish configurations
-     @Override
-     protected void customServerAiStep() {
-         //this.level().getProfiler().push("camelBrain"); // Purpur
-         Brain<Camel> brain = (Brain<Camel>) this.getBrain(); // Paper - decompile fix
-+        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Plazma - Add missing pufferfish configurations
-         brain.tick((ServerLevel)this.level(), this);
-         //this.level().getProfiler().pop(); // Purpur
-         //this.level().getProfiler().push("camelActivityUpdate"); // Purpur
-diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index 24e351b40745d15e065f4c3cd904596c6daf4cfb..aa60c4a251de2877a9b4ea72899f07194ce15ed7 100644
---- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-@@ -527,9 +527,11 @@ public class Sniffer extends Animal {
-         return Brain.provider(SnifferAi.MEMORY_TYPES, SnifferAi.SENSOR_TYPES);
-     }
- 
-+    private int behaviorTick; // Plazma - Add missing pufferfish configurations
-     @Override
-     protected void customServerAiStep() {
-         //this.level().getProfiler().push("snifferBrain"); // Purpur
-+        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Plazma - Add missing pufferfish configurations
-         this.getBrain().tick((ServerLevel) this.level(), this);
-         //this.level().getProfiler().popPush("snifferActivityUpdate"); // Purpur
-         SnifferAi.updateActivity(this);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index 1f476a4fd148ac9a4c9ad5d12de46a16e4116239..707fd662c7f17986fffcabe774de176741456227 100644
---- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-@@ -320,7 +320,7 @@ public class Warden extends Monster implements VibrationSystem {
-         ServerLevel worldserver = (ServerLevel) this.level();
- 
-         //worldserver.getProfiler().push("wardenBrain"); // Purpur
--        if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
-+        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Plazma - Add missing pufferfish configurations
-         this.getBrain().tick(worldserver, this);
-         //this.level().getProfiler().pop(); // Purpur
-         super.customServerAiStep();

patches/server/0017-Add-option-to-change-nether-portal-size.patch

@@ -0,0 +1,90 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Sun, 5 Nov 2023 11:27:51 +0900
+Subject: [PATCH] Add option to change nether portal size
+
+
+diff --git a/src/main/java/net/minecraft/world/level/portal/PortalShape.java b/src/main/java/net/minecraft/world/level/portal/PortalShape.java
+index acdff7b4a00d563739fd301c3633a266875296fa..1266aaf4bfcf53aa16d7b9bd697a0c483d3218a9 100644
+--- a/src/main/java/net/minecraft/world/level/portal/PortalShape.java
++++ b/src/main/java/net/minecraft/world/level/portal/PortalShape.java
+@@ -113,7 +113,7 @@ public class PortalShape {
+     private static int calculateWidth(BlockGetter iblockaccess, BlockPos blockposition, Direction enumdirection, BlockStateListPopulator blocks) { // CraftBukkit
+         int i = PortalShape.getDistanceUntilEdgeAboveFrame(iblockaccess, blockposition, enumdirection, blocks); // CraftBukkit
+ 
+-        return i >= 2 && i <= 21 ? i : 0;
++        return i >= org.plazmamc.plazma.configurations.GlobalConfiguration.get().structure.netherPortal.width.min() && i <= org.plazmamc.plazma.configurations.GlobalConfiguration.get().structure.netherPortal.width.max() ? i : 0; // Plazma - Configurable nether portal size
+     }
+ 
+     private static int getDistanceUntilEdgeAboveFrame(BlockGetter iblockaccess, BlockPos blockposition, Direction enumdirection, BlockStateListPopulator blocks) { // CraftBukkit
+@@ -146,7 +146,7 @@ public class PortalShape {
+         BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
+         int j = PortalShape.getDistanceUntilTop(iblockaccess, blockposition, enumdirection, blockposition_mutableblockposition, i, mutableint, blocks); // CraftBukkit
+ 
+-        return j >= 3 && j <= 21 && PortalShape.hasTopFrame(iblockaccess, blockposition, enumdirection, blockposition_mutableblockposition, i, j, blocks) ? j : 0; // CraftBukkit
++        return j >= org.plazmamc.plazma.configurations.GlobalConfiguration.get().structure.netherPortal.height.min() && j <= org.plazmamc.plazma.configurations.GlobalConfiguration.get().structure.netherPortal.height.max() && PortalShape.hasTopFrame(iblockaccess, blockposition, enumdirection, blockposition_mutableblockposition, i, j, blocks) ? j : 0; // Craftbukkit // Plazma - Configurable nether portal size
+     }
+ 
+     private static boolean hasTopFrame(BlockGetter iblockaccess, BlockPos blockposition, Direction enumdirection, BlockPos.MutableBlockPos blockposition_mutableblockposition, int i, int j, BlockStateListPopulator blocks) { // CraftBukkit
+@@ -200,7 +200,7 @@ public class PortalShape {
+     }
+ 
+     public boolean isValid() {
+-        return this.width >= 2 && this.width <= 21 && this.height >= 3 && this.height <= 21;
++        return this.width >= org.plazmamc.plazma.configurations.GlobalConfiguration.get().structure.netherPortal.width.min() && this.width <= org.plazmamc.plazma.configurations.GlobalConfiguration.get().structure.netherPortal.width.max() && this.height >= org.plazmamc.plazma.configurations.GlobalConfiguration.get().structure.netherPortal.height.min() && this.height <= org.plazmamc.plazma.configurations.GlobalConfiguration.get().structure.netherPortal.height.max(); // Plazma - Configurable nether portal size
+     }
+ 
+     // CraftBukkit start - return boolean, add entity
+diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+index e153370e617e63a8e497036c93ea55dfe851bc6e..11d386d3e134b1994302c4e026b6a11c46336522 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+@@ -70,6 +70,26 @@ public class GlobalConfiguration extends ConfigurationPart {
+     public Structure structure;
+     public class Structure extends ConfigurationPart {
+ 
++        public NetherPortal netherPortal;
++        public class NetherPortal extends ConfigurationPart {
++
++            public Width width;
++            public class Width extends ConfigurationPart {
++
++                int min = 2; public int min() { return Math.max(this.min, 1); }
++                int max = 21; public int max() { return Math.max(this.min, this.max); }
++
++            }
++
++            public Height height;
++            public class Height extends ConfigurationPart {
++
++                int min = 3; public int min() { return Math.max(this.min, 2); }
++                int max = 21; public int max() { return Math.max(this.min, this.max); }
++
++            }
++
++        }
+ 
+     }
+ 
+diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
+index c222d58520b655b54b8975ec226a4ba948691cd4..c703237d46b114227cf0d5cdff2e033839bc5f57 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
+@@ -36,17 +36,6 @@ public class WorldConfigurations extends ConfigurationPart {
+ 
+     }
+ 
+-    public Structure structure;
+-    public class Structure extends ConfigurationPart {
+-
+-        public NetherPortal netherPortal;
+-        public class NetherPortal extends ConfigurationPart {
+-
+-
+-        }
+-
+-    }
+-
+     public Block block;
+     public class Block extends ConfigurationPart {
+         

patches/server/0018-Add-option-to-change-nether-portal-size.patch

@@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 5 Nov 2023 11:27:51 +0900
-Subject: [PATCH] Add option to change nether portal size
-
-
-diff --git a/src/main/java/net/minecraft/world/level/portal/PortalShape.java b/src/main/java/net/minecraft/world/level/portal/PortalShape.java
-index 46910a3bdacc9df1835e16b300f9e107744d2660..9b372b494b831c374bab478267309544b4b31748 100644
---- a/src/main/java/net/minecraft/world/level/portal/PortalShape.java
-+++ b/src/main/java/net/minecraft/world/level/portal/PortalShape.java
-@@ -99,7 +99,7 @@ public class PortalShape {
-     private int calculateWidth() {
-         int i = this.getDistanceUntilEdgeAboveFrame(this.bottomLeft, this.rightDir);
- 
--        return i >= 2 && i <= 21 ? i : 0;
-+        return i >= this.level.getMinecraftWorld().plazmaConfig().structure.netherPortal.width.min() && i <= this.level.getMinecraftWorld().plazmaConfig().structure.netherPortal.width.max() ? i : 0; // Plazma - Configurable nether portal size
-     }
- 
-     private int getDistanceUntilEdgeAboveFrame(BlockPos pos, Direction direction) {
-@@ -132,7 +132,7 @@ public class PortalShape {
-         BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
-         int i = this.getDistanceUntilTop(blockposition_mutableblockposition);
- 
--        return i >= 3 && i <= 21 && this.hasTopFrame(blockposition_mutableblockposition, i) ? i : 0;
-+        return i >= this.level.getMinecraftWorld().plazmaConfig().structure.netherPortal.height.min() && i <= this.level.getMinecraftWorld().plazmaConfig().structure.netherPortal.height.max() && this.hasTopFrame(blockposition_mutableblockposition, i) ? i : 0; // Plazma - Configurable nether portal size
-     }
- 
-     private boolean hasTopFrame(BlockPos.MutableBlockPos pos, int height) {
-@@ -186,7 +186,7 @@ public class PortalShape {
-     }
- 
-     public boolean isValid() {
--        return this.bottomLeft != null && this.width >= 2 && this.width <= 21 && this.height >= 3 && this.height <= 21;
-+        return this.bottomLeft != null && this.width >= this.level.getMinecraftWorld().plazmaConfig().structure.netherPortal.width.min() && this.width <= this.level.getMinecraftWorld().plazmaConfig().structure.netherPortal.width.max() && this.height >= this.level.getMinecraftWorld().plazmaConfig().structure.netherPortal.height.min() && this.height <= this.level.getMinecraftWorld().plazmaConfig().structure.netherPortal.height.max(); // Plazma - Configurable nether portal size
-     }
- 
-     // CraftBukkit start - return boolean
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index a372b5be3b1da5868d3766a8ba58997a48118581..d79410cc8b6054e5d3297b3e768fb232f97062e4 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-@@ -42,6 +42,21 @@ public class WorldConfigurations extends ConfigurationPart {
-         public NetherPortal netherPortal;
-         public class NetherPortal extends ConfigurationPart {
- 
-+            public Width width;
-+            public class Width extends ConfigurationPart {
-+
-+                int min = 2; public int min() { return Math.max(this.min, 1); }
-+                int max = 21; public int max() { return Math.max(this.min, this.max); }
-+
-+            }
-+
-+            public Height height;
-+            public class Height extends ConfigurationPart {
-+
-+                int min = 3; public int min() { return Math.max(this.min, 2); }
-+                int max = 21; public int max() { return Math.max(this.min, this.max); }
-+
-+            }
- 
-         }
- 

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

@@ -7,10 +7,10 @@ Subject: [PATCH] Apply various optimizations
 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 2092ede561d14ace1c003ced051cd4967bb41beb..0cf2180519457817a5985cf34e5564cd0ec1b1a2 100644
+index aa171a1afb9800e6ec84f6b4f1b28e44177752f7..eaf53f5f4c33ca7a7a988e7bd04b7033e16f9529 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2154,8 +2154,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2309,8 +2309,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      public void playerTouch(Player player) {}
  
      public void push(Entity entity) {
@@ -21,7 +21,7 @@ index 2092ede561d14ace1c003ced051cd4967bb41beb..0cf2180519457817a5985cf34e5564cd
                  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();
-@@ -2183,8 +2184,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2338,8 +2339,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                          entity.push(d0, 0.0D, d1);
                      }
                  }

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

@@ -5,10 +5,10 @@ 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 0847aef56d8608cb1403485f231f30b2527f35ab..fee30f686a5d1ee50a00c2073efd5b0a80e85179 100644
+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
-@@ -71,6 +71,7 @@ public class PhantomSpawner implements CustomSpawner {
+@@ -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));
@@ -17,10 +17,10 @@ index 0847aef56d8608cb1403485f231f30b2527f35ab..fee30f686a5d1ee50a00c2073efd5b0a
                                          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 e9850b634c4e9bbebea6534690632b067b69b0b6..036c0b12553ae203e8c73d44dc2e3d625b812af5 100644
+index c703237d46b114227cf0d5cdff2e033839bc5f57..a976e2b960a5f3b7ecf6e42afcb1dd3bd140b8bd 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-@@ -32,6 +32,7 @@ public class WorldConfigurations extends ConfigurationPart {
+@@ -31,6 +31,7 @@ public class WorldConfigurations extends ConfigurationPart {
          public Phantom phantom;
          public class Phantom extends ConfigurationPart {
  

patches/server/0019-Reduce-create-random-instance.patch

@@ -1,319 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 27 Sep 2023 21:18:22 +0900
-Subject: [PATCH] Reduce create random instance
-
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c153becedc7c8573dc1d8a736581db2a31a8d4f5..fcc197256be00621bb3875c20849fe083a453c5c 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -236,6 +236,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     @Nullable
-     private ServerStatus.Favicon statusIcon;
-     private final RandomSource random;
-+    public RandomSource random() { return this.random; } // Plazma - expose random
-     public final DataFixer fixerUpper;
-     private String localIp;
-     private int port;
-diff --git a/src/main/java/net/minecraft/server/commands/SpreadPlayersCommand.java b/src/main/java/net/minecraft/server/commands/SpreadPlayersCommand.java
-index b47a8a082170bcb630c4354be7c77a4cac71d105..7fe6b99e146e7374cd29534f1e89046edd340a82 100644
---- a/src/main/java/net/minecraft/server/commands/SpreadPlayersCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/SpreadPlayersCommand.java
-@@ -66,7 +66,7 @@ public class SpreadPlayersCommand {
-         if (maxY < j) {
-             throw SpreadPlayersCommand.ERROR_INVALID_MAX_HEIGHT.create(maxY, j);
-         } else {
--            RandomSource randomsource = RandomSource.create();
-+            RandomSource randomsource = worldserver.plazmaConfig().misc.reduceRandom ? worldserver.getRandom() : RandomSource.create(); // Plazma - Reduce create random instance
-             double d0 = (double) (center.x - maxRange);
-             double d1 = (double) (center.y - maxRange);
-             double d2 = (double) (center.x + maxRange);
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 36b7686fdfeaab13cb1be9610ddc76fc70f6f6e5..10b990ea1c86fcaf7fd6afb8998d144bb5463e3a 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -456,7 +456,7 @@ public class ServerPlayer extends Player {
-             long l = k * k;
-             int i1 = l > 2147483647L ? Integer.MAX_VALUE : (int) l;
-             int j1 = this.getCoprime(i1);
--            int k1 = RandomSource.create().nextInt(i1);
-+            int k1 = (worldserver.plazmaConfig().misc.reduceRandom ? worldserver.getRandom() : RandomSource.create()).nextInt(i1); // Plazma - Reduce create random instance
- 
-             for (int l1 = 0; l1 < i1; ++l1) {
-                 int i2 = (k1 + j1 * l1) % i1;
-@@ -493,7 +493,7 @@ public class ServerPlayer extends Player {
-             long l = k * k;
-             int i1 = l > 2147483647L ? Integer.MAX_VALUE : (int) l;
-             int j1 = this.getCoprime(i1);
--            int k1 = RandomSource.create().nextInt(i1);
-+            int k1 = (world.plazmaConfig().misc.reduceRandom ? world.getRandom() : RandomSource.create()).nextInt(i1); // Plazma - Reduce create random instance
- 
-             for (int l1 = 0; l1 < i1; ++l1) {
-                 int i2 = (k1 + j1 * l1) % i1;
-diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 8b62f992ec61d0a66a3856b4928ee2d705548291..01069a21857f9f3b7905861ee38c3891903af3b8 100644
---- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -71,7 +71,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
-         this.serverId = "";
-         this.server = server;
-         this.connection = connection;
--        this.challenge = Ints.toByteArray(RandomSource.create().nextInt());
-+        this.challenge = Ints.toByteArray((org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom ? server.random() : RandomSource.create()).nextInt()); // Plazma - Reduce create random instance
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java b/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java
-index 1ef089dbf83de35d875c00efdf468c397be56978..832c3fa9f6f6706c48d5744e15d3c748edafe8a4 100644
---- a/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java
-+++ b/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java
-@@ -349,7 +349,7 @@ public class QueryThreadGs4 extends GenericThread {
-             this.identBytes[2] = bs[5];
-             this.identBytes[3] = bs[6];
-             this.ident = new String(this.identBytes, StandardCharsets.UTF_8);
--            this.challenge = RandomSource.create().nextInt(16777216);
-+            this.challenge = (org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom ? net.minecraft.server.MinecraftServer.getServer().random() : RandomSource.create()).nextInt(16777216); // Plazma - Reduce create random instance
-             this.challengeBytes = String.format(Locale.ROOT, "\t%s%d\u0000", this.ident, this.challenge).getBytes(StandardCharsets.UTF_8);
-         }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java b/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java
-index 9d01471da0571c92a60cd57ebd22a5f0b5648fb4..ec6c295f276f91ac7cc70f8fbfc04ba1148003b4 100644
---- a/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java
-@@ -15,7 +15,7 @@ import net.minecraft.util.RandomSource;
- 
- public class ShufflingList<U> implements Iterable<U> {
-     protected final List<ShufflingList.WeightedEntry<U>> entries;
--    private final RandomSource random = RandomSource.create();
-+    private final RandomSource random = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom ? net.minecraft.server.MinecraftServer.getServer().random() : RandomSource.create(); // Plazma - Reduce create random instance
-     private final boolean isUnsafe; // Paper - Fix Concurrency issue in ShufflingList during worldgen
- 
-     public ShufflingList() {
-diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java
-index 7094701d213c73ba47ace806962244c10fdf4dda..590c26307374edd65a2e22de18d12f34addcef64 100644
---- a/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java
-@@ -8,7 +8,7 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType;
- import net.minecraft.world.entity.ai.targeting.TargetingConditions;
- 
- public abstract class Sensor<E extends LivingEntity> {
--    private static final RandomSource RANDOM = RandomSource.createThreadSafe();
-+    private static final RandomSource RANDOM = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom && org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.ignoreThreadSafeRandom ? net.minecraft.server.MinecraftServer.getServer().random() : RandomSource.createThreadSafe(); // Plazma - Reduce create random instance
-     private static final int DEFAULT_SCAN_RATE = 20;
-     protected static final int TARGETING_RANGE = 16;
-     private static final TargetingConditions TARGET_CONDITIONS = TargetingConditions.forNonCombat().range(16.0D);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java b/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java
-index 1017c294b48bf0bbf733e1f41d580d1e6c927834..31cea7c1b73fdf3e47849ebbed28120be164e712 100644
---- a/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java
-@@ -32,7 +32,7 @@ public class AngerManagement {
-     @VisibleForTesting
-     protected static final int MAX_ANGER = 150;
-     private static final int DEFAULT_ANGER_DECREASE = 1;
--    private int conversionDelay = Mth.randomBetweenInclusive(RandomSource.create(), 0, 2);
-+    private int conversionDelay = Mth.randomBetweenInclusive((org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom ? net.minecraft.server.MinecraftServer.getServer().random() : RandomSource.create()), 0, 2); // Plazma - Reduce create random instance
-     int highestAnger;
-     private static final Codec<Pair<UUID, Integer>> SUSPECT_ANGER_PAIR = RecordCodecBuilder.create((instance) -> {
-         return instance.group(UUIDUtil.CODEC.fieldOf("uuid").forGetter(Pair::getFirst), ExtraCodecs.NON_NEGATIVE_INT.fieldOf("anger").forGetter(Pair::getSecond)).apply(instance, Pair::of);
-diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-index 752b38d45d59d8b3cd492246e5aa4f378a78734d..38b534e4613641046ed3cd048f52dff0888acda2 100644
---- a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-@@ -32,7 +32,7 @@ public class WanderingTraderSpawner implements CustomSpawner {
-     private static final int SPAWN_CHANCE_INCREASE = 25;
-     private static final int SPAWN_ONE_IN_X_CHANCE = 10;
-     private static final int NUMBER_OF_SPAWN_ATTEMPTS = 10;
--    private final RandomSource random = RandomSource.create();
-+    private final RandomSource random = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom ? net.minecraft.server.MinecraftServer.getServer().random() : RandomSource.create(); // Plazma - reduce create random instace
-     private final ServerLevelData serverLevelData;
-     private int tickDelay;
-     private int spawnDelay;
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-index 91497f5e6c07fcf1b05eca6846c51e1a15ed3bc0..1317d8289898798a9d86a4c995a4a1a317631bf7 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-@@ -87,7 +87,7 @@ public class FishingHook extends Projectile {
- 
-     private FishingHook(EntityType<? extends FishingHook> type, Level world, int luckOfTheSeaLevel, int lureLevel) {
-         super(type, world);
--        this.syncronizedRandom = RandomSource.create();
-+        this.syncronizedRandom = world.plazmaConfig().misc.reduceRandom ? world.getRandom() : RandomSource.create(); // Plazma - Reduce create random instance
-         this.openWater = true;
-         this.currentState = FishingHook.FishHookState.FLYING;
-         this.noCulling = true;
-diff --git a/src/main/java/net/minecraft/world/entity/raid/Raid.java b/src/main/java/net/minecraft/world/entity/raid/Raid.java
-index eaa2943b667967f93f28d9d794d702fdaeb670ec..689a4ee7b3f136b14e8e56709cac7d2da89c8efd 100644
---- a/src/main/java/net/minecraft/world/entity/raid/Raid.java
-+++ b/src/main/java/net/minecraft/world/entity/raid/Raid.java
-@@ -109,7 +109,7 @@ public class Raid {
- 
-     public Raid(int id, ServerLevel world, BlockPos pos) {
-         this.raidEvent = new ServerBossEvent(Raid.RAID_NAME_COMPONENT, BossEvent.BossBarColor.RED, BossEvent.BossBarOverlay.NOTCHED_10);
--        this.random = RandomSource.create();
-+        this.random = world.plazmaConfig().misc.reduceRandom ? world.getRandom() : RandomSource.create(); // Plazma - Reduce create random instace
-         this.waveSpawnPos = Optional.empty();
-         this.id = id;
-         this.level = world;
-@@ -123,7 +123,7 @@ public class Raid {
- 
-     public Raid(ServerLevel world, CompoundTag nbt) {
-         this.raidEvent = new ServerBossEvent(Raid.RAID_NAME_COMPONENT, BossEvent.BossBarColor.RED, BossEvent.BossBarOverlay.NOTCHED_10);
--        this.random = RandomSource.create();
-+        this.random = world.plazmaConfig().misc.reduceRandom ? world.getRandom() : RandomSource.create(); // Plazma - Reduce create random instace
-         this.waveSpawnPos = Optional.empty();
-         this.level = world;
-         this.id = nbt.getInt("Id");
-diff --git a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
-index 849b6a30d412d10f1e2e6e88f2d8d990e4a720e4..5534c8c65588724f2c6f178caacc2ddabad9a9e3 100644
---- a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
-@@ -97,7 +97,7 @@ public class EnchantmentMenu extends AbstractContainerMenu {
-             }
-             // Purpur end
-         };
--        this.random = RandomSource.create();
-+        this.random = playerInventory.player.level().plazmaConfig().misc.reduceRandom ? playerInventory.player.level().random : RandomSource.create(); // Plazma - Reduce create random instace
-         this.enchantmentSeed = DataSlot.standalone();
-         this.costs = new int[3];
-         this.enchantClue = new int[]{-1, -1, -1};
-diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 059e545fd04b7919fb0cc86797b636e3cda61027..8c90c4ff41b2a12cb6ba70d0bc80755ba8246872 100644
---- a/src/main/java/net/minecraft/world/level/Explosion.java
-+++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -92,7 +92,7 @@ public class Explosion {
-     }
- 
-     public Explosion(Level world, @Nullable Entity entity, @Nullable DamageSource damageSource, @Nullable ExplosionDamageCalculator behavior, double x, double y, double z, float power, boolean createFire, Explosion.BlockInteraction destructionType, ParticleOptions particle, ParticleOptions emitterParticle, SoundEvent soundEvent) {
--        this.random = RandomSource.create();
-+        this.random = world.plazmaConfig().misc.reduceRandom ? world.getRandom() : RandomSource.create(); // Plazma - Reduce create random instace
-         this.toBlow = new ObjectArrayList();
-         this.hitPlayers = Maps.newHashMap();
-         this.level = world;
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 4eb8cab1f7f2d3d2dcba15bb0bd64b60c027882a..11c864f3947b93f0ebeae8c6fd006a5891162b44 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -122,16 +122,16 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     public final Thread thread;
-     private final boolean isDebug;
-     private int skyDarken;
--    protected int randValue = RandomSource.create().nextInt();
-     protected final int addend = 1013904223;
-     protected float oRainLevel;
-     public float rainLevel;
-     protected float oThunderLevel;
-     public float thunderLevel;
-     public final RandomSource random = RandomSource.create();
-+    protected int randValue = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom ? random.nextInt() : RandomSource.create().nextInt(); // Plazma - Reduce create random instace
-     /** @deprecated */
-     @Deprecated
--    private final RandomSource threadSafeRandom = RandomSource.createThreadSafe();
-+    private final RandomSource threadSafeRandom = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.ignoreThreadSafeRandom ? random : RandomSource.createThreadSafe(); // Plazma - Reduce create random instace
-     private final ResourceKey<DimensionType> dimensionTypeId;
-     private final Holder<DimensionType> dimensionTypeRegistration;
-     public final WritableLevelData levelData;
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index 1b150b9fc444a248f6c01572447c7bb8eecfc76e..9579f730c8de447bed6634d0e2af85547949698b 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-@@ -369,7 +369,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
-     }
- 
-     private static void spawnGatewayPortal(ServerLevel world, BlockPos pos, EndGatewayConfiguration config) {
--        Feature.END_GATEWAY.place(config, world, world.getChunkSource().getGenerator(), RandomSource.create(), pos);
-+        Feature.END_GATEWAY.place(config, world, world.getChunkSource().getGenerator(), (world.plazmaConfig().misc.reduceRandom ? world.getRandom() : RandomSource.create()), pos); // Plazma - Reduce create random instance
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
-index 798e22fb4d685b5845ebf687e8004e94f13a9751..189f425565c9c38b29031ae26de667422eb3b6bb 100644
---- a/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
-@@ -224,7 +224,7 @@ public class ChunkGeneratorStructureState {
-             List<CompletableFuture<ChunkPos>> list = new ArrayList(j);
-             int k = placement.spread();
-             HolderSet<Biome> holderset = placement.preferredBiomes();
--            RandomSource randomsource = RandomSource.create();
-+            RandomSource randomsource = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom ? net.minecraft.server.MinecraftServer.getServer().random() : RandomSource.create(); // Plazma - Reduce create random instace
- 
-             // Paper start - Add missing structure set seed configs
-             if (this.conf.strongholdSeed != null && structureSetEntry.is(net.minecraft.world.level.levelgen.structure.BuiltinStructureSets.STRONGHOLDS)) {
-diff --git a/src/main/java/net/minecraft/world/level/dimension/end/DragonRespawnAnimation.java b/src/main/java/net/minecraft/world/level/dimension/end/DragonRespawnAnimation.java
-index 7bbe93966fa00b7001da53bf2f22f4d942b7cc22..6c5eececc83571b0f60e7f672ed185e1d262e99c 100644
---- a/src/main/java/net/minecraft/world/level/dimension/end/DragonRespawnAnimation.java
-+++ b/src/main/java/net/minecraft/world/level/dimension/end/DragonRespawnAnimation.java
-@@ -81,7 +81,7 @@ public enum DragonRespawnAnimation {
-                         world.explode((Entity) null, (double) ((float) worldgenender_spike.getCenterX() + 0.5F), (double) worldgenender_spike.getHeight(), (double) ((float) worldgenender_spike.getCenterZ() + 0.5F), 5.0F, Level.ExplosionInteraction.BLOCK);
-                         SpikeConfiguration worldgenfeatureendspikeconfiguration = new SpikeConfiguration(true, ImmutableList.of(worldgenender_spike), new BlockPos(0, 128, 0));
- 
--                        Feature.END_SPIKE.place(worldgenfeatureendspikeconfiguration, world, world.getChunkSource().getGenerator(), RandomSource.create(), new BlockPos(worldgenender_spike.getCenterX(), 45, worldgenender_spike.getCenterZ()));
-+                        Feature.END_SPIKE.place(worldgenfeatureendspikeconfiguration, world, world.getChunkSource().getGenerator(), (world.plazmaConfig().misc.reduceRandom ? world.getRandom() : RandomSource.create()), new BlockPos(worldgenender_spike.getCenterX(), 45, worldgenender_spike.getCenterZ())); // Plazma - Reduce create random instance
-                     }
-                 } else if (flag1) {
-                     fight.setRespawnStage(SUMMONING_DRAGON); // CraftBukkit - decompile error
-diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index d4f903c402765c6e8e1db99e148613748f530726..c8d76fdee94a0ffb76fcb476ca386acf154dda28 100644
---- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-+++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-@@ -472,7 +472,7 @@ public class EndDragonFight {
-         this.level.registryAccess().registry(Registries.CONFIGURED_FEATURE).flatMap((iregistry) -> {
-             return iregistry.getHolder(EndFeatures.END_GATEWAY_DELAYED);
-         }).ifPresent((holder_c) -> {
--            ((ConfiguredFeature) holder_c.value()).place(this.level, this.level.getChunkSource().getGenerator(), RandomSource.create(), pos);
-+            holder_c.value().place(this.level, this.level.getChunkSource().getGenerator(), (this.level.plazmaConfig().misc.reduceRandom ? this.level.getRandom() : RandomSource.create()), pos); // Plazma - Reduce create random instace
-         });
-     }
- 
-@@ -490,7 +490,7 @@ public class EndDragonFight {
-             this.portalLocation = this.portalLocation.atY(this.level.getMinBuildHeight() + 1);
-         }
-         // Paper end - Prevent "softlocked" exit portal generation
--        if (worldgenendtrophy.place(FeatureConfiguration.NONE, this.level, this.level.getChunkSource().getGenerator(), RandomSource.create(), this.portalLocation)) {
-+        if (worldgenendtrophy.place(FeatureConfiguration.NONE, this.level, this.level.getChunkSource().getGenerator(), (this.level.plazmaConfig().misc.reduceRandom ? this.level.getRandom() : RandomSource.create()), this.portalLocation)) { // Plazma - Reduce create random instace
-             int i = Mth.positiveCeilDiv(4, 16);
- 
-             this.level.getChunkSource().chunkMap.waitForLightBeforeSending(new ChunkPos(this.portalLocation), i);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 1309fabd357eb9b8f90f882ec7ff3de9e60f187d..d300668899c3382a42e6a25dd084fb814b56f6bc 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-@@ -14,11 +14,12 @@ import org.bukkit.inventory.meta.FireworkMeta;
- 
- public class CraftFirework extends CraftProjectile implements Firework {
- 
--    private final Random random = new Random();
-+    private final net.minecraft.util.RandomSource random; // Plazma - Reduce create random instance
-     //private CraftItemStack item; // Paper - Remove usage, not accurate representation of current item.
- 
-     public CraftFirework(CraftServer server, FireworkRocketEntity entity) {
-         super(server, entity);
-+        this.random = this.getHandle().level().plazmaConfig().misc.reduceRandom ? this.getHandle().level().getRandom() : net.minecraft.util.RandomSource.create(); // Plazma - Reduce create random instance
- 
- //        Paper start - Expose firework item directly
- //        ItemStack item = this.getHandle().getEntityData().get(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM);
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 294fdbba44191427a841f8ac82b18ed8d706f53e..be9e364a02eb872940443e3ba3349c3ccad3cb0f 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -64,6 +64,8 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public Miscellaneous misc;
-     public class Miscellaneous extends ConfigurationPart {
- 
-+        public boolean reduceRandom = OPTIMIZE;
-+        public boolean ignoreThreadSafeRandom = false;
- 
-     }
- 
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index d79410cc8b6054e5d3297b3e768fb232f97062e4..e9850b634c4e9bbebea6534690632b067b69b0b6 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-@@ -22,6 +22,7 @@ public class WorldConfigurations extends ConfigurationPart {
-     public Miscellaneous misc;
-     public class Miscellaneous extends ConfigurationPart {
- 
-+        public boolean reduceRandom = OPTIMIZE;
- 
-     }
- 

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

@@ -0,0 +1,37 @@
+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 9ae16e24013ea5664d4ea6d52ed7dd188404890f..91f161d27a45174b6f3c31440eea46ff81185203 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -1695,7 +1695,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 11d386d3e134b1994302c4e026b6a11c46336522..93d746b0e7f263b36a66864834445cb41e5e2cee 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+@@ -37,6 +37,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+     public Player player;
+     public class Player extends ConfigurationPart {
+ 
++        public boolean checkSpectatorMovedToQuickly = !OPTIMIZE;
+ 
+     }
+ 

patches/server/0021-Avoid-double-I-O-operation-on-load-player-file.patch

@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 27 Sep 2023 22:13:07 +0900
-Subject: [PATCH] Avoid double I/O operation on load player file
-
-
-diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-index 63e187c65cb855031f286aad0d25ac4694f7a331..3dca62446fbb7c92f5f2908b36926bbe5e905dbb 100644
---- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-+++ b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-@@ -60,7 +60,8 @@ public class PlayerDataStorage {
-             File file = new File(this.playerDir, player.getStringUUID() + ".dat");
-             // Spigot Start
-             boolean usingWrongFile = false;
--            if ( org.bukkit.Bukkit.getOnlineMode() && !file.exists() ) // Paper - Check online mode first
-+            boolean isNormalFile = file.exists() && file.isFile(); // Plazma - Avoid double I/O operation
-+            if ( org.bukkit.Bukkit.getOnlineMode() && !isNormalFile ) // Paper - Check online mode first // Plazma - Avoid double I/O operation
-             {
-                 file = new File( this.playerDir, java.util.UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + player.getScoreboardName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
-                 if ( file.exists() )
-@@ -71,7 +72,7 @@ public class PlayerDataStorage {
-             }
-             // Spigot End
- 
--            if (file.exists() && file.isFile()) {
-+            if (isNormalFile) { // Plazma - Avoid double I/O operation
-                 nbttagcompound = NbtIo.readCompressed(file.toPath(), NbtAccounter.unlimitedHeap());
-             }
-             // Spigot Start

patches/server/0021-Configurable-cave-lava-sea-level.patch

@@ -0,0 +1,63 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Tue, 7 Nov 2023 15:32:24 +0900
+Subject: [PATCH] Configurable cave lava sea level
+
+This patch also fix MC-237017.
+
+diff --git a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
+index 3f39d6c786d9dfdd9ad591e08ff05fcbb41a1df6..0346fd4ab7095d66c0eef5a440afbc7a8ba52466 100644
+--- a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
++++ b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
+@@ -71,14 +71,14 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {
+     }
+ 
+     private static Aquifer.FluidPicker createFluidPicker(NoiseGeneratorSettings settings) {
+-        Aquifer.FluidStatus aquifer_b = new Aquifer.FluidStatus(-54, Blocks.LAVA.defaultBlockState());
+-        int i = settings.seaLevel();
+-        Aquifer.FluidStatus aquifer_b1 = new Aquifer.FluidStatus(i, settings.defaultFluid());
+-        Aquifer.FluidStatus aquifer_b2 = new Aquifer.FluidStatus(DimensionType.MIN_Y * 2, Blocks.AIR.defaultBlockState());
+-
+-        return (j, k, l) -> {
+-            return k < Math.min(-54, i) ? aquifer_b : aquifer_b1;
+-        };
++        // Plazma start - Configurable default lava sea level
++        int i = org.plazmamc.plazma.configurations.GlobalConfiguration.get().worldgen.lavaSea.startLevel;
++        int j = settings.seaLevel();
++        Aquifer.FluidStatus aquifer1 = new Aquifer.FluidStatus(i, org.plazmamc.plazma.configurations.GlobalConfiguration.get().worldgen.lavaSea.seaBlock());
++        Aquifer.FluidStatus aquifer2 = new Aquifer.FluidStatus(j, settings.defaultFluid());
++
++        return (x, y, z) -> y < Math.min(i, j) ? aquifer1 : aquifer2;
++        // Plazma end - Configurable default lava sea level
+     }
+ 
+     @Override
+diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+index 93d746b0e7f263b36a66864834445cb41e5e2cee..0b59a3a36c86948877cb8cb875dc114e9f9d284a 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+@@ -45,6 +45,24 @@ public class GlobalConfiguration extends ConfigurationPart {
+     public WorldGeneration worldgen;
+     public class WorldGeneration extends ConfigurationPart {
+ 
++        public LavaSea lavaSea;
++        public class LavaSea extends ConfigurationPart {
++
++            public int startLevel = -54;
++            String seaBlock = "default";
++
++            public net.minecraft.world.level.block.state.BlockState seaBlock() {
++                if (this.seaBlock.equalsIgnoreCase("default")) return net.minecraft.world.level.block.Blocks.LAVA.defaultBlockState();
++                return net.minecraft.core.registries.BuiltInRegistries.BLOCK
++                        .getOptional(net.minecraft.resources.ResourceLocation.tryParse(this.seaBlock))
++                        .orElseGet(() -> {
++                            PlazmaConfigurations.LOGGER.warn("Invalid custom sea level block: {}, defaulting to lava", this.seaBlock);
++                            return net.minecraft.world.level.block.Blocks.LAVA;
++                        })
++                        .defaultBlockState();
++            }
++
++        }
+ 
+     }
+ 

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

@@ -5,31 +5,32 @@ 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 546b14cc2cf0c4145a059142aa33ad113d7479bf..0c1e3cb455d2a184ab9f0084d10bd7cde83f9027 100644
+index 7ca12a1128661ea36e2e33cda204c7d2df55a21c..331a75fee26e3fe2532e8661db282a0c207ddf9b 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -938,10 +938,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -951,10 +951,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
-         }
+         ProfilerFiller gameprofilerfiller = Profiler.get();
-         // Paper end - Allow nerfed mobs to jump and float
+ 
-         //this.level().getProfiler().push("sensing"); // Purpur
+         gameprofilerfiller.push("sensing");
 -        this.sensing.tick();
-+        //this.sensing.tick(); // Plazma - Moved down
++        //this.sensing.tick(); // Plazma - moved down
-         //this.level().getProfiler().pop(); // Purpur
+         gameprofilerfiller.pop();
-         int i = this.level().getServer().getTickCount() + this.getId();
+         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) {
-             //this.level().getProfiler().push("targetSelector"); // Purpur
+             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 909a74c19501d9440f3d2435b6514d738efcfc05..b036b54d551c892cc48d0a6816382bce5e38efd4 100644
+index a976e2b960a5f3b7ecf6e42afcb1dd3bd140b8bd..9e408d6c1826d36a935b3e382e8eb0283f3d1580 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-@@ -30,6 +30,7 @@ public class WorldConfigurations extends ConfigurationPart {
+@@ -28,6 +28,8 @@ public class WorldConfigurations extends ConfigurationPart {
+     public Entity entity;
      public class Entity extends ConfigurationPart {
  
-         public boolean ignoreUselessPackets = OPTIMIZE;
 +        public int sensorTick = 1;
- 
++
          public Phantom phantom;
          public class Phantom extends ConfigurationPart {
+ 

patches/server/0022-Do-not-refresh-LootTable-for-non-player-interaction.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:03:06 +0900
-Subject: [PATCH] Do not refresh LootTable for non player interaction
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-index b41635dd0569ff7df909df492d3e850aef7214be..afc567b789ee003e1b10059db2864a423c682669 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-@@ -68,6 +68,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
- 
-     @Override
-     public void unpackLootTable(@org.jetbrains.annotations.Nullable final Player player) {
-+        if (player == null && org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.refreshLootTableForNonPlayerInteraction) return; // Plazma - Do not refresh LootTable for non player interaction
-         // Copied from super with changes, always check the original method
-         net.minecraft.world.level.Level level = this.getLevel();
-         BlockPos blockPos = this.getBlockPos();
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index be9e364a02eb872940443e3ba3349c3ccad3cb0f..472069754c6e297474578ff237ae8d02c827b61c 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -66,6 +66,7 @@ public class GlobalConfiguration extends ConfigurationPart {
- 
-         public boolean reduceRandom = OPTIMIZE;
-         public boolean ignoreThreadSafeRandom = false;
-+        public boolean refreshLootTableForNonPlayerInteraction = !OPTIMIZE;
- 
-     }
- 

patches/server/0023-Variable-entity-wakeup-duration.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Variable entity wakeup duration
 
 
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index b036b54d551c892cc48d0a6816382bce5e38efd4..459cba838468b95547b2a515c497fcbb7bd45718 100644
+index 9e408d6c1826d36a935b3e382e8eb0283f3d1580..a371893777a2c2d1de22e7d52f2fd3f55b82d74d 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-@@ -39,6 +39,20 @@ public class WorldConfigurations extends ConfigurationPart {
+@@ -37,6 +37,20 @@ public class WorldConfigurations extends ConfigurationPart {
  
          }
  
@@ -28,21 +28,22 @@ index b036b54d551c892cc48d0a6816382bce5e38efd4..459cba838468b95547b2a515c497fcbb
 +
      }
  
-     public Structure structure;
+     public Block block;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 2e9aed328e576abbe216fdb2071c13421e6645b8..cb6ad8ffef606a4074fa2ef4a5f92438124e8f11 100644
+index 9b1a16747aa23b18e4cff986efaac6ce64b6ddb9..6a45bafaa1d7ddc0f80c0945e15c3d6c67f9f2b3 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -68,29 +68,36 @@ public class ActivationRange
+@@ -66,29 +66,37 @@ public class ActivationRange
-         Activity.PANIC
+         net.minecraft.world.entity.schedule.Activity.PANIC
      };
  
 +    // Plazma start - Variable entity wakeup duration
-+    private static int getWakeupDuration(net.minecraft.util.RandomSource random, int duration, double deviation) {
++    private static int getWakeUpDuration(net.minecraft.util.RandomSource random, int duration, double deviation) {
 +        if (deviation == 0) return duration;
 +        return (int) Math.min(Integer.MAX_VALUE, Math.max(1, Math.round(duration * (1 + deviation * random.nextGaussian()))));
 +    }
 +    // Plazma end - Variable entity wakeup duration
++
      private static int checkInactiveWakeup(Entity entity) {
          Level world = entity.level();
          SpigotWorldConfig config = world.spigotConfig;
@@ -52,25 +53,25 @@ index 2e9aed328e576abbe216fdb2071c13421e6645b8..cb6ad8ffef606a4074fa2ef4a5f92438
              if (inactiveFor > config.wakeUpInactiveVillagersEvery && world.wakeupInactiveRemainingVillagers > 0) {
                  world.wakeupInactiveRemainingVillagers--;
 -                return config.wakeUpInactiveVillagersFor;
-+                return getWakeupDuration(world.getRandom(), config.wakeUpInactiveVillagersFor, plazmaConfig.entity.wakeUpDurationVariance.villager()); // Plazma - Variable entity wakeup duration
++                return getWakeUpDuration(world.getRandom(), config.wakeUpInactiveVillagersFor, plazmaConfig.entity.wakeUpDurationVariance.villager()); // Plazma - Variable entity wakeup duration
              }
          } else if (entity.activationType == ActivationType.ANIMAL) {
              if (inactiveFor > config.wakeUpInactiveAnimalsEvery && world.wakeupInactiveRemainingAnimals > 0) {
                  world.wakeupInactiveRemainingAnimals--;
 -                return config.wakeUpInactiveAnimalsFor;
-+                return getWakeupDuration(world.getRandom(), config.wakeUpInactiveAnimalsFor, plazmaConfig.entity.wakeUpDurationVariance.animal()); // Plazma - Variable entity wakeup duration
++                return getWakeUpDuration(world.getRandom(), config.wakeUpInactiveAnimalsFor, plazmaConfig.entity.wakeUpDurationVariance.animal()); // Plazma - Variable entity wakeup duration
              }
          } else if (entity.activationType == ActivationType.FLYING_MONSTER) {
              if (inactiveFor > config.wakeUpInactiveFlyingEvery && world.wakeupInactiveRemainingFlying > 0) {
                  world.wakeupInactiveRemainingFlying--;
 -                return config.wakeUpInactiveFlyingFor;
-+                return getWakeupDuration(world.getRandom(), config.wakeUpInactiveFlyingFor, plazmaConfig.entity.wakeUpDurationVariance.flying()); // Plazma - Variable entity wakeup duration
++                return getWakeUpDuration(world.getRandom(), config.wakeUpInactiveFlyingFor, plazmaConfig.entity.wakeUpDurationVariance.flying()); // Plazma - Variable entity wakeup duration
              }
          } else if (entity.activationType == ActivationType.MONSTER || entity.activationType == ActivationType.RAIDER) {
              if (inactiveFor > config.wakeUpInactiveMonstersEvery && world.wakeupInactiveRemainingMonsters > 0) {
                  world.wakeupInactiveRemainingMonsters--;
 -                return config.wakeUpInactiveMonstersFor;
-+                return getWakeupDuration(world.getRandom(), config.wakeUpInactiveMonstersFor, plazmaConfig.entity.wakeUpDurationVariance.monster()); // Plazma - Variable entity wakeup duration
++                return getWakeUpDuration(world.getRandom(), config.wakeUpInactiveMonstersFor, plazmaConfig.entity.wakeUpDurationVariance.monster()); // Plazma - Variable entity wakeup duration
              }
          }
          return -1;

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

@@ -1,31 +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 ae5a2152cde8922deeb8d1d8a85bf39518ccd759..d4672d73df93c597a19e98e5d9b7dfa377b3f200 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1472,6 +1472,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                                 }
-                                 // Paper end - Prevent moving into unloaded chunks
- 
-+                                if (!this.player.getBukkitEntity().hasPermission("plazma.bypass-moved-to-quickly-check") || !(org.plazmamc.plazma.configurations.GlobalConfiguration.get().player.checkSpectatorMovedToQuickly && this.player.isSpectator())) // Plazma - Options to bypass moved to quickly check
-                                 if (!this.player.isChangingDimension() && (!this.player.level().getGameRules().getBoolean(GameRules.RULE_DISABLE_ELYTRA_MOVEMENT_CHECK) || !this.player.isFallFlying())) {
-                                     float f2 = this.player.isFallFlying() ? 300.0F : 100.0F;
- 
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 472069754c6e297474578ff237ae8d02c827b61c..e1c4551a83f8ce996ebed3e2ba7bf50cd532d6ac 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -27,6 +27,7 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public Player player;
-     public class Player extends ConfigurationPart {
- 
-+        public boolean checkSpectatorMovedToQuickly = !OPTIMIZE;
- 
-     }
- 

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

@@ -7,10 +7,10 @@ Subject: [PATCH] Add entity spawn deadlock timer
 - AbsolemJackdaw/FixMySpawnR
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 40c199812ecf7b16fe5a17c18cb0d6d3ce258910..f01390790cab0425e5d702d93b6755be41e94313 100644
+index bb4411cfdf1bc7adc12c2f918d2eec830299f38b..357d484029fe338bea4f5770d13ccfc0dce4432e 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-@@ -48,6 +48,8 @@ public abstract class BaseSpawner {
+@@ -50,6 +50,8 @@ public abstract class BaseSpawner {
      public int requiredPlayerRange = 16;
      public int spawnRange = 4;
      private int tickDelay = 0; // Paper - Configurable mob spawner tick rate
@@ -19,7 +19,7 @@ index 40c199812ecf7b16fe5a17c18cb0d6d3ce258910..f01390790cab0425e5d702d93b6755be
  
      public BaseSpawner() {}
  
-@@ -83,6 +85,17 @@ public abstract class BaseSpawner {
+@@ -85,6 +87,17 @@ public abstract class BaseSpawner {
      }
  
      public void serverTick(ServerLevel world, BlockPos pos) {
@@ -37,33 +37,34 @@ index 40c199812ecf7b16fe5a17c18cb0d6d3ce258910..f01390790cab0425e5d702d93b6755be
          if (spawnCount <= 0 || maxNearbyEntities <= 0) return; // Paper - Ignore impossible spawn tick
          // Paper start - Configurable mob spawner tick rate
          if (spawnDelay > 0 && --tickDelay > 0) return;
-@@ -280,6 +293,12 @@ public abstract class BaseSpawner {
+@@ -290,6 +303,13 @@ public abstract class BaseSpawner {
-         if (nbt.contains("SpawnRange", 99)) {
              this.spawnRange = nbt.getShort("SpawnRange");
          }
+ 
 +        // Plazma start - Add entity spawn deadlock timer
 +        if (nbt.contains("Plazma.SpawnerTicks", 99)) {
 +            this.blockExistsTick = nbt.getInt("Plazma.SpawnerTicks");
 +            this.blockLockedByTime = nbt.getBoolean("Plazma.SpawnerLocked");
 +        }
 +        // Plazma end - Add entity spawn deadlock timer
- 
++
          this.displayEntity = null;
      }
-@@ -309,6 +328,8 @@ public abstract class BaseSpawner {
+ 
+@@ -318,6 +338,8 @@ public abstract class BaseSpawner {
              }));
          }
  
 +        nbt.putInt("Plazma.SpawnerTicks", this.blockExistsTick); // Plazma - Add entity spawn deadlock timer
 +        nbt.putBoolean("Plazma.SpawnerLocked", this.blockLockedByTime); // Plazma - Add entity spawn deadlock timer
-         nbt.put("SpawnPotentials", (Tag) SpawnData.LIST_CODEC.encodeStart(NbtOps.INSTANCE, this.spawnPotentials).result().orElseThrow());
+         nbt.put("SpawnPotentials", (Tag) SpawnData.LIST_CODEC.encodeStart(NbtOps.INSTANCE, this.spawnPotentials).getOrThrow());
          return nbt;
      }
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-index b1293935e55fcb1c45224e5bda9be8d1045ff4e8..e5e0b0f0bd3b2249dc1db029682b8957b0addcac 100644
+index a371893777a2c2d1de22e7d52f2fd3f55b82d74d..d366e8755ba91c329164c16659f6b07245577fba 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
-@@ -54,6 +54,14 @@ public class WorldConfigurations extends ConfigurationPart {
+@@ -51,6 +51,14 @@ public class WorldConfigurations extends ConfigurationPart {
  
          }
  
@@ -77,4 +78,4 @@ index b1293935e55fcb1c45224e5bda9be8d1045ff4e8..e5e0b0f0bd3b2249dc1db029682b8957
 +
      }
  
-     public Structure structure;
+     public Block block;

patches/server/0025-Implement-No-Chat-Reports.patch

@@ -1,170 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Thu, 28 Sep 2023 11:47:50 +0900
-Subject: [PATCH] Implement No Chat Reports
-
-Implemented: 644bb6bb4a8012c75900c643d9863fe92c799e1d
-
-diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-index bdcfd80f937c34956911373905d66424bbff8e1d..6c575aeeef323c8eb0837eb9d9eea8fcff21da17 100644
---- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-+++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-@@ -145,9 +145,13 @@ public class FriendlyByteBuf extends ByteBuf {
-         // Paper end - Adventure; add max length parameter
-         DataResult<JsonElement> dataresult = codec.encodeStart(JsonOps.INSTANCE, value);
- 
--        this.writeUtf(FriendlyByteBuf.GSON.toJson((JsonElement) Util.getOrThrow(dataresult, (s) -> {
--            return new EncoderException("Failed to encode: " + s + " " + value);
--        })), maxLength); // Paper - Adventure; add max length parameter
-+        // Plazma start - Implement No Chat Reports
-+        JsonElement element = Util.getOrThrow(dataresult, s -> new EncoderException("Failed to encode: " + s + " " + value));
-+        if (codec == net.minecraft.network.protocol.status.ServerStatus.CODEC
-+                && org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.queryData())
-+            element.getAsJsonObject().addProperty("preventsChatReports", true);
-+        this.writeUtf(GSON.toJson(element), maxLength);
-+        // Plazma end - Implement No Chat Reports
-     }
- 
-     public <T> void writeId(IdMap<T> registry, T value) {
-diff --git a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatCommandPacket.java b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatCommandPacket.java
-index b8c1f3b9afddc87d56541c8af63cffecfcdd2653..4fe3de84fbbd16ecfe0b27922d5bfeaa9c89f61b 100644
---- a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatCommandPacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatCommandPacket.java
-@@ -24,4 +24,13 @@ public record ServerboundChatCommandPacket(String command, Instant timeStamp, lo
-     public void handle(ServerGamePacketListener listener) {
-         listener.handleChatCommand(this);
-     }
-+
-+    // Plazma start - Implement No Chat Reports
-+    @Override
-+    public ArgumentSignatures argumentSignatures() {
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.enabled)
-+            return ArgumentSignatures.EMPTY;
-+        return this.argumentSignatures;
-+    }
-+    // Plazma end - Implement No Chat Reports
- }
-diff --git a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatPacket.java b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatPacket.java
-index d1d2fc0c57523c1abf1e8bfec913c78927c3dafc..bd69821b153b692b508505264899bdfda4805f0f 100644
---- a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatPacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatPacket.java
-@@ -25,4 +25,12 @@ public record ServerboundChatPacket(String message, Instant timeStamp, long salt
-     public void handle(ServerGamePacketListener listener) {
-         listener.handleChat(this);
-     }
-+
-+    // Plazma start - Implement No Chat Reports
-+    @Override
-+    public @Nullable MessageSignature signature() {
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.enabled) return null;
-+        return this.signature;
-+    }
-+    // Plazma end - Implement No Chat Reports
- }
-diff --git a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatSessionUpdatePacket.java b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatSessionUpdatePacket.java
-index 9d6db4a378036559efab91c8b7dcf2a6b0c2cce6..587d89d67afe9108b5e810463fb3cb21f1b8accf 100644
---- a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatSessionUpdatePacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatSessionUpdatePacket.java
-@@ -16,6 +16,15 @@ public record ServerboundChatSessionUpdatePacket(RemoteChatSession.Data chatSess
- 
-     @Override
-     public void handle(ServerGamePacketListener listener) {
-+        // Plazma start - Implement No Chat Reports
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.requireModInstallation()) {
-+            ((net.minecraft.server.network.ServerGamePacketListenerImpl) listener).disconnect(
-+                    net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.requireModInstallation.message),
-+                    org.bukkit.event.player.PlayerKickEvent.Cause.NCR_NOT_INSTALLED
-+            );
-+            return;
-+        }
-+        // Plazma end - Implement No Chat Reports
-         listener.handleChatSessionUpdate(this);
-     }
- }
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 2a73508dd8a59c6af8b65ab2db97b6e20b104c57..eb6bcea28df735efe53ed62080bb726f7314c280 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -682,6 +682,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
- 
-     @Override
-     public boolean enforceSecureProfile() {
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.enabled) return false; // Plazma - Implement No Chat Reports
-         DedicatedServerProperties dedicatedserverproperties = this.getProperties();
- 
-         // Paper start - Add setting for proxy online mode status
-diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 02e65b0bd212d46855baee48fab35dc95a88b43f..59c96512dcdac551e9919c3893e1340f86e3e861 100644
---- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -271,10 +271,31 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-     }
- 
-     public void send(Packet<?> packet) {
-+        // Plazma start - Implement No Chat Reports
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.convertToSystemMessage()
-+            && this instanceof ServerGamePacketListenerImpl impl
-+            && packet instanceof net.minecraft.network.protocol.game.ClientboundPlayerChatPacket p) {
-+            impl.send(new net.minecraft.network.protocol.game.ClientboundSystemChatPacket(
-+                p.chatType().resolve(impl.player.level().registryAccess())
-+                    .orElseThrow().decorate(p.unsignedContent() != null ? p.unsignedContent() : Component.literal(p.body().content())),
-+                false
-+            ));
-+            return;
-+        }
-+        // Plazma end - Implement No Chat Reports
-         this.send(packet, (PacketSendListener) null);
-     }
- 
-     public void send(Packet<?> packet, @Nullable PacketSendListener callbacks) {
-+        // Plazma start - Implement No Chat Reports
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.convertToSystemMessage()
-+                && callbacks != null
-+                && this instanceof ServerGamePacketListenerImpl impl
-+                && packet instanceof net.minecraft.network.protocol.game.ClientboundPlayerChatPacket p) {
-+            impl.send(p);
-+            return;
-+        }
-+        // Plazma end - Implement No Chat Reports
-         // CraftBukkit start
-         if (packet == null || this.processedDisconnect) { // Spigot
-             return;
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ef4b1fb1532e1939d9a7e5337edc80b334b78318..f3b081abd82036c928655923c44a62a0e9889031 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1499,6 +1499,7 @@ public abstract class PlayerList {
-     }
- 
-     public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.enabled) return true; // Plazma - Implement No Chat Reports
-         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 e1c4551a83f8ce996ebed3e2ba7bf50cd532d6ac..62d891f05b90b323f0282fe26665965a10c317e6 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -80,4 +80,22 @@ public class GlobalConfiguration extends ConfigurationPart {
- 
-     }
- 
-+    public NoChatReports noChatReports;
-+    public class NoChatReports extends ConfigurationPart {
-+
-+        public boolean enabled = false;
-+        boolean queryData = true; public boolean queryData() { return this.enabled && this.queryData; }
-+        boolean convertToSystemMessage = true; public boolean convertToSystemMessage() { return this.enabled && this.convertToSystemMessage; }
-+        public boolean requireModInstallation() { return this.enabled && this.requireModInstallation.enabled; }
-+
-+        public RequireModInstallation requireModInstallation;
-+        public class RequireModInstallation extends ConfigurationPart {
-+
-+            boolean enabled = false;
-+            public String message = "You do not have No Chat Reports, and this server is configured to require it on client!";
-+
-+        }
-+
-+    }
-+
- }

patches/server/0026-Lithium-HashedList.patch

@@ -288,10 +288,10 @@ index 0000000000000000000000000000000000000000..d11579075e653868a43fe826bdf9b41d
 +
 +}
 diff --git a/src/main/java/net/minecraft/util/random/WeightedRandomList.java b/src/main/java/net/minecraft/util/random/WeightedRandomList.java
-index 1bcb5a58b945cdb3dc94efb314d7ba41fbb38e07..3bd989b2af76392a31d2aca23fdab20a79dc3933 100644
+index ef44047c3ea850fe52370b8176efbdf0515d20d6..30efa8704c1ae94027272602687cbc4a2bc8a772 100644
 --- a/src/main/java/net/minecraft/util/random/WeightedRandomList.java
 +++ b/src/main/java/net/minecraft/util/random/WeightedRandomList.java
-@@ -8,10 +8,10 @@ import net.minecraft.util.RandomSource;
+@@ -10,10 +10,10 @@ import net.minecraft.util.RandomSource;
  
  public class WeightedRandomList<E extends WeightedEntry> {
      private final int totalWeight;

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

@@ -5,10 +5,10 @@ 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 bfa69b2c37f07132f8b31c12d26f4ceb074901a5..61cf0db77966e35da9ca30718b7e667f4c8a9297 100644
+index f4604e543a980d6aeb485252da5a4e755aa12bfa..f2753cf51634479e501c1a3e7931d6d9882bc801 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2624,6 +2624,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2821,6 +2821,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      protected void updateSwingTime() {

patches/server/0027-Improve-biome-temperature-cache.patch

@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Mon, 6 Nov 2023 10:39:01 +0900
-Subject: [PATCH] Improve biome temperature cache
-
-[REFERENCE]
-- FxMorin/MemoryLeakFix
-
-diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java
-index efca73d4de33028cf9df944f36e51b7b50f7a4c5..a4aee46177a771c492d46e6996fb2c6e5eed3921 100644
---- a/src/main/java/net/minecraft/world/level/biome/Biome.java
-+++ b/src/main/java/net/minecraft/world/level/biome/Biome.java
-@@ -67,7 +67,7 @@ public final class Biome {
-     private final MobSpawnSettings mobSettings;
-     private final BiomeSpecialEffects specialEffects;
-     // Pufferfish start - use our cache
--    private final ThreadLocal<gg.airplane.structs.Long2FloatAgingCache> temperatureCache = ThreadLocal.withInitial(() -> {
-+    private static final ThreadLocal<gg.airplane.structs.Long2FloatAgingCache> temperatureCache = ThreadLocal.withInitial(() -> { // Plazma - Improve biome temperature cache
-         return Util.make(() -> {
-             /*
-             Long2FloatLinkedOpenHashMap long2FloatLinkedOpenHashMap = new Long2FloatLinkedOpenHashMap(1024, 0.25F) {
-@@ -125,7 +125,7 @@ public final class Biome {
-     public float getTemperature(BlockPos blockPos) {
-         long l = blockPos.asLong();
-         // Pufferfish start
--        gg.airplane.structs.Long2FloatAgingCache cache = this.temperatureCache.get();
-+        gg.airplane.structs.Long2FloatAgingCache cache = temperatureCache.get(); // Plazma - Improve biome temperature cache
-         float f = cache.getValue(l);
-         if (!Float.isNaN(f)) {
-             return f;

patches/server/0028-Save-Json-list-asynchronously.patch

@@ -5,71 +5,108 @@ Subject: [PATCH] Save Json list asynchronously
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedPlayerList.java b/src/main/java/net/minecraft/server/dedicated/DedicatedPlayerList.java
-index 1c9cf5e1c4ee05724ffcdbd77a19bca1ab2be4d3..bc3b251a3f8ad345bdaaf67be59ff2c143d4d130 100644
+index 22c4f8dea99f92a1eb3da2baf0a15bf9d2ca0462..20c531f11b310dab0a867e589c769393ed835df5 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedPlayerList.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedPlayerList.java
-@@ -60,20 +60,20 @@ public class DedicatedPlayerList extends PlayerList {
+@@ -58,21 +58,23 @@ public class DedicatedPlayerList extends PlayerList {
+         this.loadWhiteList();
      }
  
++    // Plazma start - Save JSON list asynchronously
      private void saveIpBanList() {
 -        try {
-+        //try { // Plazma - Save Json list asynchronously
+-            this.getIpBans().save();
-             this.getIpBans().save();
 -        } catch (IOException var2) {
-+        /*} catch (IOException var2) { // Plazma - Save Json list asynchronously
+-            LOGGER.warn("Failed to save ip banlist: ", (Throwable)var2);
-             LOGGER.warn("Failed to save ip banlist: ", (Throwable)var2);
 -        }
-+        }*/ // Plazma - Save Json list asynchronously
++        this.getIpBans().save();
- 
      }
  
      private void saveUserBanList() {
 -        try {
-+        //try { // Plazma - Save Json list asynchronously
+-            this.getBans().save();
-             this.getBans().save();
 -        } catch (IOException var2) {
-+        /*} catch (IOException var2) { // Plazma - Save Json list asynchronously
+-            LOGGER.warn("Failed to save user banlist: ", (Throwable)var2);
-             LOGGER.warn("Failed to save user banlist: ", (Throwable)var2);
 -        }
-+        }*/ // Plazma - Save Json list asynchronously
++        this.getBans().save();
++    }
++
++    private void saveOps() {
++        this.getOps().save();
++    }
++
++    private void saveWhiteList() {
++        this.getWhiteList().save();
+     }
++    // Plazma end - Save JSON list asynchronously
  
+     private void loadIpBanList() {
+         try {
+@@ -98,14 +100,6 @@ public class DedicatedPlayerList extends PlayerList {
+         }
      }
  
+-    private void saveOps() {
+-        try {
+-            this.getOps().save();
+-        } catch (Exception var2) {
+-            LOGGER.warn("Failed to save operators list: ", (Throwable)var2);
+-        }
+-    }
+-
+     private void loadWhiteList() {
+         try {
+             this.getWhiteList().load();
+@@ -114,14 +108,6 @@ public class DedicatedPlayerList extends PlayerList {
+         }
+     }
+ 
+-    private void saveWhiteList() {
+-        try {
+-            this.getWhiteList().save();
+-        } catch (Exception var2) {
+-            LOGGER.warn("Failed to save white-list: ", (Throwable)var2);
+-        }
+-    }
+-
+     @Override
+     public boolean isWhiteListed(GameProfile profile) {
+         return !this.isUsingWhitelist() || this.isOp(profile) || this.getWhiteList().isWhiteListed(profile);
 diff --git a/src/main/java/net/minecraft/server/players/StoredUserList.java b/src/main/java/net/minecraft/server/players/StoredUserList.java
-index 1289e8e9c54a584f5037ea8e852df37376af093d..2014e0c4f412bead5881de588ec941a9a5ae3565 100644
+index c038da20b76c0b7b1c18471b20be01e849d29f3a..0735a0bd182635e1969d19336b46bc72b14e555f 100644
 --- a/src/main/java/net/minecraft/server/players/StoredUserList.java
 +++ b/src/main/java/net/minecraft/server/players/StoredUserList.java
-@@ -43,11 +43,11 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -42,13 +42,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+ 
      public void add(V entry) {
          this.map.put(this.getKeyForUser(entry.getUser()), entry);
- 
+-
 -        try {
-+        //try { // Plazma - Save Json list asynchronously
+-            this.save();
-             this.save();
 -        } catch (IOException ioexception) {
-+        /*} catch (IOException ioexception) { // Plazma - Save Json list asynchronously
+-            StoredUserList.LOGGER.warn("Could not save the list after adding a user.", ioexception);
-             StoredUserList.LOGGER.warn("Could not save the list after adding a user.", ioexception);
 -        }
-+        }*/ // Plazma - Save Json list asynchronously
+-
- 
++        this.save(); // Plazma - Save Json list asynchronously
      }
  
-@@ -63,11 +63,11 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+     @Nullable
+@@ -62,13 +56,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+ 
      public void remove(K key) {
          this.map.remove(this.getKeyForUser(key));
- 
+-
 -        try {
-+        //try { // Plazma - Save Json list asynchronously
+-            this.save();
-             this.save();
 -        } catch (IOException ioexception) {
-+        /*} catch (IOException ioexception) { // Plazma - Save Json list asynchronously
+-            StoredUserList.LOGGER.warn("Could not save the list after removing a user.", ioexception);
-             StoredUserList.LOGGER.warn("Could not save the list after removing a user.", ioexception);
 -        }
-+        }*/ // Plazma - Save Json list asynchronously
+-
- 
++        this.save(); // Plazma - Save Json list asynchronously
      }
  
-@@ -102,7 +102,10 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+     public void remove(StoredUserEntry<K> entry) {
+@@ -102,7 +90,9 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
          return this.map.values();
      }
  
@@ -77,11 +114,10 @@ index 1289e8e9c54a584f5037ea8e852df37376af093d..2014e0c4f412bead5881de588ec941a9
 +    // Plazma start - Save Json list asynchronously
 +    public void save()/* throws IOException*/ {
 +        io.papermc.paper.util.MCUtil.scheduleAsyncTask(() -> {
-+
          this.removeExpired(); // Paper - remove expired values before saving
          JsonArray jsonarray = new JsonArray();
          Stream<JsonObject> stream = this.map.values().stream().map((jsonlistentry) -> { // CraftBukkit - decompile error
-@@ -114,27 +117,16 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -114,27 +104,16 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
  
          Objects.requireNonNull(jsonarray);
          stream.forEach(jsonarray::add);
@@ -89,7 +125,7 @@ index 1289e8e9c54a584f5037ea8e852df37376af093d..2014e0c4f412bead5881de588ec941a9
  
 -        try {
 +        try (BufferedWriter bufferedwriter = Files.newWriter(this.file, StandardCharsets.UTF_8)) {
-             StoredUserList.GSON.toJson(jsonarray, bufferedwriter);
+             StoredUserList.GSON.toJson(jsonarray, StoredUserList.GSON.newJsonWriter(bufferedwriter));
 -        } catch (Throwable throwable) {
 -            if (bufferedwriter != null) {
 -                try {

patches/server/0029-Configurable-cave-lava-sea-level.patch

@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Tue, 7 Nov 2023 15:32:24 +0900
-Subject: [PATCH] Configurable cave lava sea level
-
-This patch also fix MC-237017.
-
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
-index 98c7f695093acbcf9382a5f07a7a89e373709763..a85b1ebb4236f131b9be0104c4aa56f22e661441 100644
---- a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
-@@ -72,6 +72,15 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {
-     }
- 
-     private static Aquifer.FluidPicker createFluidPicker(NoiseGeneratorSettings settings) {
-+        // Plazma start - Configurable cave lava sea level
-+        if (true) {
-+            org.plazmamc.plazma.configurations.GlobalConfiguration config = org.plazmamc.plazma.configurations.GlobalConfiguration.get();
-+            return (x, y, z) -> new Aquifer.FluidStatus(
-+                    config.worldgen.caveLavaSeaLevel.useCustomSeaLevel ? config.worldgen.caveLavaSeaLevel.customSeaLevel : settings.seaLevel(),
-+                    config.worldgen.caveLavaSeaLevel.customSeaLevel(settings)
-+            );
-+        }
-+        // Plazma end - Configurable cave lava sea level
-         Aquifer.FluidStatus aquifer_b = new Aquifer.FluidStatus(-54, Blocks.LAVA.defaultBlockState());
-         int i = settings.seaLevel();
-         Aquifer.FluidStatus aquifer_b1 = new Aquifer.FluidStatus(i, settings.defaultFluid());
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 3e1d646ead7105f4955d47cb224f23ee4d9e3e69..7408401e7e9bd80c1e179c5eca994294f4c01950 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -35,6 +35,25 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public WorldGeneration worldgen;
-     public class WorldGeneration extends ConfigurationPart {
- 
-+        public CaveLavaSeaLevel caveLavaSeaLevel;
-+        public class CaveLavaSeaLevel extends ConfigurationPart {
-+
-+            public boolean useCustomSeaLevel = false;
-+            public int customSeaLevel = -54;
-+            String customSeaBlock = "default";
-+
-+            public net.minecraft.world.level.block.state.BlockState customSeaLevel(net.minecraft.world.level.levelgen.NoiseGeneratorSettings settings) {
-+                if (this.customSeaBlock.equalsIgnoreCase("default")) return settings.defaultFluid();
-+                return net.minecraft.core.registries.BuiltInRegistries.BLOCK
-+                        .getOptional(new net.minecraft.resources.ResourceLocation(this.customSeaBlock))
-+                        .orElseGet(() -> {
-+                            PlazmaConfigurations.LOGGER.warn("Invalid custom sea level block: {}, defaulting to lava", this.customSeaBlock);
-+                            return net.minecraft.world.level.block.Blocks.LAVA;
-+                        })
-+                        .defaultBlockState();
-+            }
-+
-+        }
- 
-     }
- 

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

@@ -0,0 +1,19 @@
+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 746ad8087192931400256c8a1ef71e966eaf6b1a..14695f421c3751a1e75567aecf3685d901790011 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("-DPlazma.DevelopmentEnvironment", "-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods") // Plazma - Always agree EULA on development mode
++    jvmArgs("-DPlazma.DevelopmentEnvironment", "--add-modules=jdk.incubator.vector", "-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods", "-XX:+UseG1GC", "-XX:+ParallelRefProcEnabled", "-XX:MaxGCPauseMillis=200", "-XX:+UnlockExperimentalVMOptions", "-XX:+DisableExplicitGC", "-XX:+AlwaysPreTouch", "-XX:G1HeapWastePercent=5", "-XX:G1MixedGCCountTarget=4", "-XX:InitiatingHeapOccupancyPercent=15", "-XX:G1MixedGCLiveThresholdPercent=90", "-XX:G1RSetUpdatingPauseTimePercent=5", "-XX:SurvivorRatio=32", "-XX:+PerfDisableSharedMem", "-XX:MaxTenuringThreshold=1", "-Dusing.aikars.flags=https://mcflags.emc.gs", "-Daikars.new.flags=true", "-XX:G1NewSizePercent=40", "-XX:G1MaxNewSizePercent=50", "-XX:G1HeapRegionSize=16M", "-XX:G1ReservePercent=15") // Plazma - Always agree EULA on development mode; Use Akair's flag when running the test server with gradle
+ 
+     if (rootProject.childProjects["test-plugin"] != null) {
+         val testPluginJar = rootProject.project(":test-plugin").tasks.jar.flatMap { it.archiveFile }

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

@@ -0,0 +1,77 @@
+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 20266ef8f0974f47581e71175de4b01ea1a27bf0..54ef910938efb537a689dd5dbda119455bbf2a0e 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -1627,29 +1627,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");
+ 
+ }