[ci-skip] Now stable

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

.editorconfig

@@ -0,0 +1,40 @@
+[*]
+charset=utf-8
+end_of_line=lf
+insert_final_newline=true
+indent_style=space
+indent_size=4
+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
+
+[*.tiny]
+indent_style=tab
+
+[*.bat]
+end_of_line=crlf
+
+[*.yml]
+indent_size=2
+
+[*.patch]
+trim_trailing_whitespace=false
+
+[*.java]
+ij_continuation_indent_size = 4
+ij_java_class_count_to_use_import_on_demand = 999999
+ij_java_insert_inner_class_imports = false
+ij_java_names_count_to_use_import_on_demand = 999999
+ij_java_imports_layout = *,|,$*
+ij_java_generate_final_locals = true
+ij_java_generate_final_parameters = true
+
+[test-plugin/**/*.java]
+ij_java_use_fq_class_names = false
+
+[Paper-Server/src/main/resources/data/**/*.json]
+indent_size = 2
+
+[paper-api-generator/generated/**/*.java]
+ij_java_imports_layout = $*,|,*

.github/workflows/build.yml

@@ -1,118 +0,0 @@
-name: Build Plazma
-
-on:
-  push:
-    branches: [ "ver/*", "feat/*", "dev/*", "expr/*", "ench/*", "impl/*" ]
-  workflow_dispatch:
-
-env:
-  ORG_NAME: PlazmaMC
-  MC_VERSION: 1.20.2
-  MAIN_BRANCH: ver/1.20.1
-  DEBUG: 'false'
-
-jobs:
-  release:
-    strategy:
-      matrix:
-        base_jdk: [17]
-        graal: [latest]
-        os: [ubuntu-22.04]
-
-    if: "!startsWith(github.event.commits[0].message, '[CI-Skip]')"
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout action
-        uses: actions/checkout@v3
-
-      - name: Checkout pages
-        uses: actions/checkout@v3
-        with:
-          path: javadoc
-          ref: gh-pages
-          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.GH_PAT }}
-          java-version: ${{ matrix.base_jdk }}
-          version: ${{ matrix.graal }}
-          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
-        continue-on-error: true
-        if: github.ref_name == env.MAIN_BRANCH
-        run: |
-          (cd Plazma-API/build/docs/javadoc && tar c .) | (cd javadoc && tar xf -)
-          cd javadoc
-          git add . && git commit -m "Update Javadocs"
-          git push
-
-      - name: Publish Packages
-        if: github.ref_name == env.MAIN_BRANCH
-        run: |
-          export GITHUB_USERNAME=${{ env.ORG_NAME }}
-          export GITHUB_TOKEN=${{ secrets.GH_PAT }}
-          ./gradlew publish --stacktrace
-
-      - name: Upload Artifacts
-        if: env.DEBUG == 'true' || !startsWith(github.ref_name, 'ver/')
-        uses: actions/upload-artifact@v3
-        with:
-          name: Artifacts
-          path: |
-            build/libs
-            Plazma-API/build/docs/javadoc
-      
-      - name: Get Release Number
-        if: startsWith(github.ref_name, 'ver/')
-        run: echo "RELEASE=$(git ls-remote --tags origin | grep "release" | wc -l)" >> $GITHUB_ENV
-
-      - name: Release Artifacts
-        if: startsWith(github.ref_name, 'ver/')
-        uses: marvinpinto/action-automatic-releases@latest
-        with:
-          title: "Release #${{ env.RELEASE }}"
-          automatic_release_tag: release-${{ env.RELEASE }}
-          repo_token: "${{ secrets.GH_PAT }}"
-          files: build/libs/*.jar
-          prerelease: false
-          
-      - name: Release Artifacts (Latest/Stable)
-        if: startsWith(github.ref_name, 'ver/')
-        uses: marvinpinto/action-automatic-releases@latest
-        with:
-          title: "Release #${{ env.RELEASE }}"
-          automatic_release_tag: latest-${{ env.MC_VERSION }}
-          repo_token: "${{ secrets.GH_PAT }}"
-          files: build/libs/*.jar
-          prerelease: false
-
-      - name: Release Artifacts (Latest/Development)
-        if: startsWith(github.ref_name, 'dev/')
-        uses: marvinpinto/action-automatic-releases@latest
-        with:
-          title: "Development build for ${{ env.MC_VERSION }}"
-          automatic_release_tag: dev-${{ env.MC_VERSION }}
-          repo_token: "${{ secrets.GH_PAT }}"
-          files: build/libs/*.jar
-          prerelease: true

.github/workflows/close-invalid-prs.yml

@@ -1,14 +0,0 @@
-name: Close invalid PRs
-
-on:
-  pull_request_target:
-    types: [ opened ]
-
-jobs:
-  run:
-    if: ${{ github.repository != github.event.pull_request.head.repo.full_name && !startsWith(github.head_ref, 'ver/') }}
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: superbrothers/close-pull-request@v3
-        with:
-          comment: "Please do not open pull requests from the `master` branch, create a new branch instead."

.github/workflows/gradle.yml

@@ -2,15 +2,21 @@ name: Test Gradle build script
 
 on:
   push:
-    branches: [ "ver/*", "feat/*", "dev/*", "expr/*", "ench/*", "impl/*" ]
+    branches: [ "ver/*", "dev/*", "feat/**/*" ]
+    paths:
+      - "*.kt"
+      - "*.kts"
+      - "*.toml"
+      - "gradle-wrapper.*"
   workflow_dispatch:
 
 jobs:
-  release:
+  check:
+    name: Test Gradle build script
     strategy:
       matrix:
-        jdk: [19.0.2+7]
-        java: ['temurin']
+        jdk: [21]
+        java: ['zulu']
         os: [ubuntu-22.04]
 
     if: "!contains(github.event.commits[0].message, '[CheckSkip]')"

.github/workflows/javadocs.yml

@@ -1,46 +0,0 @@
-name: Deploy Javadocs
-
-on:
-  push:
-    branches: ["gh-pages"]
-  workflow_dispatch:
-
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-concurrency:
-  group: "pages"
-  cancel-in-progress: true
-
-jobs:
-  build:
-    if: "!startsWith(github.event.commits[0].message, '[CI-Skip]')"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        
-      - name: Setup Pages
-        uses: actions/configure-pages@v3
-        
-      - name: Build with Jekyll
-        uses: actions/jekyll-build-pages@v1
-        with:
-          source: ./
-          destination: ./_site
-          
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
-
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v1

.github/workflows/release.yml

@@ -0,0 +1,141 @@
+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

.github/workflows/test.yml

@@ -1,36 +0,0 @@
-name: Test build with Normal JDK
-
-on:
-  push:
-    branches: [ "ver/*", "feat/*", "dev/*", "expr/*", "ench/*", "impl/*" ]
-  workflow_dispatch:
-
-jobs:
-  release:
-    strategy:
-      matrix:
-        jdk: [19.0.2+7]
-        java: ['temurin']
-        os: [ubuntu-22.04]
-
-    if: "!startsWith(github.event.commits[0].message, '[CI-Skip]')"
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout action
-        uses: actions/checkout@v3
-
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Set up JDK ${{ matrix.java }} ${{ matrix.jdk }}
-        uses: actions/setup-java@v3
-        with:
-          distribution: ${{ matrix.java }}
-          java-version: ${{ matrix.jdk }}
-          cache: 'gradle'
-
-      - name: Test build
-        run: |
-          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" && git config --global user.name "github-actions[bot]"
-          ./gradlew applyPatches --stacktrace
-          ./gradlew build --stacktrace

.gitignore

@@ -33,7 +33,6 @@ target/
 dependency-reduced-pom.xml
 
 # various other potential build files
-build/
 bin/
 dist/
 manifest.mf
@@ -56,4 +55,5 @@ build-data/
 *-API
 *-MojangAPI
 *-Server
-*.jar
+paper-api-generator
+compare.txt

.upstream-data

@@ -1,2 +0,0 @@
-purpurCommit = 6a6706d3b4f934845a44ecd7533bf53966e4857c
-pufferfishCommit = 2c3f3fd4e1df97dc7ff8d770061138144847850e

README.md

@@ -5,12 +5,11 @@
 ### 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)
-[![Build Status](https://img.shields.io/github/actions/workflow/status/PlazmaMC/Plazma/build.yml?branch=ver/1.20.1&logo=GoogleAnalytics&style=for-the-badge&logoColor=ffffff)](https://github.com/PlazmaMC/Plazma/actions/workflows/build.yml?query=branch:ver/1.20.1)
-[![Upstream Status](https://img.shields.io/github/actions/workflow/status/PlazmaMC/AlwaysUpToDate/plazma.yml?label=Upstream&logo=data%3Aimage%2Fpng%3Bbase64%2CiVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAACXBIWXMAAAsTAAALEwEAmpwYAAAGD0lEQVR4nO2dW4hVVRiAl5OjCFoMlpYx2WXMXjShi5FFTxFhhmFlQxlRU0kEXQiJorKIMoIiIoJegiiK8pKWZBTUg0ZpaHYhslBL8TKVTWWO00x98XP%2BicNhzt5rnb3P2WvtWd%2FjzDl7r%2FX%2F6%2FrfjjGRSCQSiUQikUgkEolEIpGIJwDHAHOA24CngTXA18Bu4BDwN3AUOAh8D3wOrAOeBLqBWUB70f0ICuBE4E7gXaCP7PwBrARuAqYU3T8vAdqB64EPgSGaxz%2F6joUyu8xoBzgOWAbsofXs0ndPNKMNoA24EThA8ezTPWZ0zAjgIt1IfWMbMM%2BUfJ1f3uQ1Po894rnSnZyAU3WEhcInwGmmDMi0BnozCGMA2KT3ADlKXgycAnQAY4HxwAnA6fouWc%2BfBzYCgxne%2BwtwgQkZ4Fq9KLlyBHgDWARMyPD%2BDr2QvamXNlf%2BAuabENGOu47AvcD9wOQmtOck4FG9NbsgfbjBhARwneNm26eCn9CCtk0EHtdZ5qKE%2BSEdM12WndVifiignbKPvOfQzsPA%2BSaA006vw%2Fq6pOD2jgHucRgw0rfpxkeAccBWBzPAHOMJMrIdBs4q4yNqArbhG2Ca8QxgBrDTov0yW8YaD9d9m013O3C88RRgmoUS%2Fm3FYcHVafKVhfB%2FAk42ngOcCfyc0I9txieApZYb7mwTCMBc4M8R%2BiGz%2FHLjC8CxlhebHhMYVDZmcXEO8wOwwPgEcJ%2BF8FebgAGmAp3GU%2FPyjxZLj5%2Fn5tBRH24aDxTdztICfGBhzp1UdDtLiYR3WJz7Hyy6naUFuCNF%2BGJ7n1p0O0uLRp8l8bYpIcAkYAXwKfAl8EzLg700pETCApPoNiUD6KpjppCTYFczXjimzt%2FPThH%2BULVHS00VfhmvGhO%2BeOvqsTc3JWgw7AagXx3i7wBnVf2%2FJ0UBn%2BnnZgLr9RniUfoYOM%2BUT%2Fj5KUGFP5IN5Dexj%2BhnniKZF9WWIt%2BppT8kJWAv%2FHyUoCM%2FyW8rgl2V0oiXU6KaPzLlFH42JejmKiM0CRHsfrIx6HscJo0LP7MSXCIFGkWU3GbKK%2FzGlaAZKM1mnSm%2F8BtTAnBGnc0zL%2BTZM8zoEH7DSpibU2rQiJu48RAqUXPNTBLZ4xT71AQleCt8AXid5vOacSFHJfgu%2FLYWHT4O17MuNFMJXgu%2FKqBMEjOy8Kve%2BNNMNO4mmQxK8F74wwBbEvoxoCmzafGtC1KUsMU0SgNKCEb4AnBZnVkwoIJ9KaW%2FK%2FQ59ZQgz77UZMFBCUEJfxjgSg09qY7iu1D%2FlxbzenPVc%2BapryD%2FcBYLJQQp%2FJoNuVOOpTXu17Q9YnadMMfO3G%2F9CZbO%2Fy2mZQJYYhF80FZE%2FORbmuS8T3OwvLzhZkX9IUmsyfySyMhIMLFF9MfSOl%2BPZAV4zCL6w9tw%2B6ChEnicFnywvuh2lhbgEdJZXHQ7SwkwXW03aXluQUd7eIlmTko0Rxp3G5%2BQ4hZVR9M%2B7cQsExhUyqWlccCrQk%2BaH3ywTr22YC5nwDkWgQnCLcYngFcTGisJbzON51AZRDJ709jqXVCBhTtvp4%2B5wTWVGr%2B1DKnxb0YDOywav8vHmUDFYPYddiw3PgK8YtmBXp9GEHCu5i%2FbsNnbUmZ6bk5Kbq5N9b%2FX2T%2Baf5t7LDdcNBrQv0zJaqS8l2ZF2vJ%2BERmUamCzOecPc8SnWZsIcIVjlax%2B4IlWJPNpoaaH9WhsixjbrjIBOjBcS5X1quUx95OSerQeaqBIrAj%2FahMiOhNclqPqTq%2FUHOTJGUf7Yr2Z267z1ch3FpmQ0T1B3HWNMqT1O18AbtdylV06osdrpn6Hlqu8RG6nwLOSoZOxXOX%2B4MtV1tiHRIihsNn7044rWlzV95LFg5p%2BOs6UFY2X8bF88RfBHDNziru5xqLKSiuQi%2BNdvqdLNQU9pSzT34JpNbu1VKU%2F9vyioJLEvVArr2SNUE5b4zdoRd%2FoRqyjjClaHV3O7r%2FnIHQJGV%2BrNe1i6IjjzGjXn6DqVlPFWq3ftkM9b0f10nZIfQ3bNX9ZkshvlVhN75wmkUgkEolEIpFIJBKJRCIRM5r5D9WH9bFOGhrhAAAAAElFTkSuQmCC&style=for-the-badge)](https://github.com/PlazmaMC/AlwaysUpToDate/actions/workflows/plazma.yml)
-[![MC Version](https://img.shields.io/badge/MC-1.20.1-6047ff?&logo=Webpack&style=for-the-badge&logoColor=ffffff)](https://github.com/PlazmaMC/Plazma/releases/latest-1.20.1)
+[![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)
+[![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)
 
 [![License](https://img.shields.io/github/license/PlazmaMC/Plazma?logo=github&style=flat-square&logoColor=ffffff)](LICENSE)
-[![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/tag/latest-1.20.1)
+[![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://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://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://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)
@@ -19,13 +18,21 @@
 
 [main]: https://github.com/PlazmaMC/Plazma
 
-### This is the branch for Plazma 1.20.2. If you want to know more about Plazma, please check the [main branch][main].
-이곳은 플라즈마의 1.20.2용 브랜치 입니다. 플라즈마에 대해 자세히 알고 싶다면 [main 브랜치][main]를 확인해주세요.
+> [!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>
+이곳은 플라즈마의 1.20.4용 분기입니다. 플라즈마에 대해 자세히 알고 싶다면 **[main 분기][main]** 를 확인해주세요.
 
 ## ⬇️ Downloads
-### If you don't know about Mojmap or Bundler, download **Reobf Paperclip**
+> [!NOTE]
+If you don't know about Mojmap or Bundler, download **Reobf Paperclip**<br>
 Mojmap 또는 Bundler에 대해 잘 알지 못한다면, **Reobf Paperclip**을 사용하세요
 
-| **Reobf Paperclip (Default)** | Mojmap Paperclip | Reobf Bundler | Mojmap Bundler |
-| :---:               | :---:            | :---:         | :---:          |
-| [Download](https://github.com/PlazmaMC/Plazma/releases/download/latest-1.20.1/plazma-paperclip-1.20.1-R0.1-SNAPSHOT-reobf.jar) | [Download](https://github.com/PlazmaMC/Plazma/releases/download/latest-1.20.1/plazma-paperclip-1.20.1-R0.1-SNAPSHOT-mojmap.jar) | [Download](https://github.com/PlazmaMC/Plazma/releases/download/latest-1.20.1/plazma-bundler-1.20.1-R0.1-SNAPSHOT-reobf.jar) | [Download](https://github.com/PlazmaMC/Plazma/releases/download/latest-1.20.1/plazma-bundler-1.20.1-R0.1-SNAPSHOT-mojmap.jar) |
+<!--- 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

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

build.gradle.kts

@@ -1,38 +1,65 @@
-import io.papermc.paperweight.util.*
-import io.papermc.paperweight.util.constants.PAPERCLIP_CONFIG
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
     java
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.7-SNAPSHOT"
+    `kotlin-dsl`
+    `always-up-to-date`
+    alias(libs.plugins.shadow) apply false
+    alias(libs.plugins.paperweight)
+}
+
+kotlin.jvmToolchain {
+    languageVersion = JavaLanguageVersion.of(17)
 }
 
 repositories {
     mavenCentral()
     maven("https://papermc.io/repo/repository/maven-public/") {
         content {
-            onlyForConfigurations(PAPERCLIP_CONFIG)
+            onlyForConfigurations(configurations.paperclip.name)
         }
     }
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.8.10:fat")
-    decompiler("net.minecraftforge:forgeflower:2.0.627.2")
-    paperclip("io.papermc:paperclip:3.0.3")
+    remapper(libs.remapper)
+    decompiler(libs.decompiler)
+    paperclip(libs.paperclip)
 }
 
-subprojects {
+allprojects {
     apply(plugin = "java")
+    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.add("--add-modules=jdk.incubator.vector")
-            options.encoding = "UTF-8"
-            options.release.set(17)
+            options.compilerArgs.addAll(listOf("--add-modules=jdk.incubator.vector", "-Xmaxwarns", "1"))
+            options.encoding = Charsets.UTF_8.name()
+            options.release = 17
         }
     
         withType<Javadoc> {
@@ -44,30 +71,26 @@ subprojects {
         }
     
         withType<Test> {
-            minHeapSize = "2g"
-            maxHeapSize = "2g"
+            testLogging {
+                showStackTraces = true
+                exceptionFormat = TestExceptionFormat.FULL
+                events(TestLogEvent.STANDARD_OUT)
+            }
         }
     }
 
     repositories {
         mavenCentral()
-        maven("https://oss.sonatype.org/content/groups/public/")
-        maven("https://papermc.io/repo/repository/maven-public/")
-        maven("https://ci.emc.gs/nexus/content/groups/aikar/")
-        maven("https://repo.aikar.co/content/groups/aikar")
-        maven("https://repo.md-5.net/content/repositories/releases/")
-        maven("https://hub.spigotmc.org/nexus/content/groups/public/")
         maven("https://jitpack.io")
-        maven("https://oss.sonatype.org/content/repositories/snapshots/")
+        maven("https://papermc.io/repo/repository/maven-public/")
     }
-
 }
 
 paperweight {
-    serverProject.set(project(":plazma-server"))
+    serverProject = project(":plazma-server")
 
-    remapRepo.set("https://maven.fabricmc.net/")
-    decompileRepo.set("https://files.minecraftforge.net/maven/")
+    remapRepo = "https://repo.papermc.io/repository/maven-public/"
+    decompileRepo = "https://repo.papermc.io/repository/maven-public/"
 
     usePaperUpstream(providers.gradleProperty("paperCommit")) {
         withPaperPatcher {
@@ -77,31 +100,56 @@ paperweight {
             serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
             serverOutputDir.set(layout.projectDirectory.dir("Plazma-Server"))
         }
-    }
-}
 
-val upstreamTask = tasks.register("updateUpstream") {
-    val tempDir = layout.cacheDir("updateUpstream");
-    val file = "gradle.properties";
-
-    doFirst {
-        val apiResponse = layout.cache.resolve("apiResponse.json");
-        download.get().download("https://api.github.com/repos/PaperMC/Paper/commits/master", apiResponse);
-        val latestCommit = gson.fromJson<paper.libs.com.google.gson.JsonObject>(apiResponse)["sha"].asString;
-
-        copy {
-            from(file)
-            into(tempDir)
-            filter { line: String ->
-                line.replace("paperCommit = .*".toRegex(), "paperCommit = $latestCommit")
-            }
+        patchTasks.register("generatedApi") {
+            isBareDirectory = true
+            upstreamDirPath = "paper-api-generator/generated"
+            patchDir = layout.projectDirectory.dir("patches/generated-api")
+            outputDir = layout.projectDirectory.dir("paper-api-generator/generated")
         }
-    }
 
-    doLast {
-        copy {
-            from(tempDir.file("gradle.properties"))
-            into(project.file(file).parent)
+        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")
+    }
+
+    rebuildPatches {
+        dependsOn("rebuildGeneratedApiPatches")
+    }
+
+    generateDevelopmentBundle {
+        apiCoordinates.set("org.plazmamc.plazma:plazma-api")
+        mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi")
+        libraryRepositories.addAll(
+                "https://repo.maven.apache.org/maven2/",
+                "https://maven.pkg.github.com/PlazmaMC/Plazma",
+                "https://papermc.io/repo/repository/maven-public/"
+        )
+    }
+}
+
+publishing {
+    publications.create<MavenPublication>("devBundle") {
+        artifact(tasks.generateDevelopmentBundle) {
+            artifactId = "dev-bundle"
         }
     }
 }

buildSrc/build.gradle.kts

@@ -0,0 +1,33 @@
+plugins {
+    java
+    `kotlin-dsl`
+    id("com.github.johnrengelman.shadow") version "8.1.1"
+}
+
+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")
+}
+
+tasks {
+    jar {
+        finalizedBy(shadowJar)
+    }
+
+    shadowJar {
+        archiveFileName.set("buildSrc.jar")
+        configurations = listOf(project.configurations["shadow"])
+
+        exclude("META-INF/gradle-plugins/io.papermc.paperweight.patcher.properties")
+        relocate("io.papermc.paperweight", "org.plazmamc.alwaysuptodate.internal.paperweight")
+        minimize()
+    }
+}

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

@@ -0,0 +1,20 @@
+package org.plazmamc.alwaysuptodate
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.plazmamc.alwaysuptodate.tasks.CheckPaperCommitTask
+import org.plazmamc.alwaysuptodate.tasks.CheckPurpurCommitTask
+import org.plazmamc.alwaysuptodate.tasks.PaperUpdateTask
+import org.plazmamc.alwaysuptodate.tasks.PurpurUpdateTask
+
+class AlwaysUpToDate : Plugin<Project> {
+
+    override fun apply(target: Project) {
+        target.extensions.create("alwaysUpToDate", AlwaysUpToDateExtension::class.java)
+        target.tasks.register("updatePaper", PaperUpdateTask::class.java)
+        target.tasks.register("updatePurpur", PurpurUpdateTask::class.java)
+        target.tasks.register("checkPaperCommit", CheckPaperCommitTask::class.java)
+        target.tasks.register("checkPurpurCommit", CheckPurpurCommitTask::class.java)
+    }
+
+}

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

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

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

@@ -0,0 +1,16 @@
+package org.plazmamc.alwaysuptodate
+
+import org.gradle.api.provider.Property
+
+interface AlwaysUpToDateExtension {
+
+    val paperRepository: Property<String>
+    val paperBranch: Property<String>
+
+    val pufferfishRepository: Property<String>
+    val pufferfishBranch: Property<String>
+
+    val purpurRepository: Property<String>
+    val purpurBranch: Property<String>
+
+}

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

@@ -0,0 +1,64 @@
+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/PaperUpdateTask.kt

@@ -0,0 +1,44 @@
+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

@@ -0,0 +1,179 @@
+package org.plazmamc.alwaysuptodate.tasks
+
+import io.papermc.paperweight.util.Git
+import io.papermc.paperweight.util.cache
+import io.papermc.paperweight.util.path
+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.Gradle
+import org.plazmamc.alwaysuptodate.utils.addCommit
+import org.plazmamc.alwaysuptodate.utils.clone
+import java.nio.file.Path
+import kotlin.io.path.createDirectories
+import kotlin.io.path.exists
+
+abstract class PurpurUpdateTask : Task() {
+
+    private val property = project.extensions["alwaysUpToDate"] as AlwaysUpToDateExtension
+    private val pufferfishCommit = """
+        Pufferfish
+        Copyright (C) 2024 Pufferfish Studios LLC
+
+        This program is free software: you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation, either version 3 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    """.trimIndent()
+    private val purpurCommit = """
+        PurpurMC
+        Copyright (C) 2024 PurpurMC
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+    """.trimIndent()
+
+    override fun init() {
+        outputs.upToDateWhen {
+            project.checkCommit(
+                property.purpurRepository.get(),
+                property.purpurBranch.get(),
+                "purpurCommit"
+            )
+        }
+    }
+
+    @TaskAction
+    fun update() {
+        if (project.checkCommit(property.purpurRepository.get(), property.purpurBranch.get(), "purpurCommit")) return
+        Git.checkForGit()
+
+        project.createCompareComment(
+            property.purpurRepository.get(),
+            property.purpurBranch.get(),
+            project.properties["purpurCommit"] as String,
+            true
+        )
+        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(),
+                property.paperBranch.get(),
+                project.file("gradle.properties")
+            )
+        }
+
+        val latestCommit = git("ls-remote", property.purpurRepository.get()).readText()?.lines()
+            ?.filterNot { "[a-z0-9]{40}\trefs/heads/${property.purpurBranch.get()}".toRegex().matches(it) }?.first()?.split("\t")?.first()
+            ?: throw AlwaysUpToDateException("Failed to get latest Purpur commit")
+
+        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)
+        }
+    }
+
+}

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

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

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

@@ -0,0 +1,18 @@
+package org.plazmamc.alwaysuptodate.utils
+
+import io.papermc.paperweight.util.Git
+import org.plazmamc.alwaysuptodate.AlwaysUpToDateException
+import java.nio.file.Path
+import kotlin.io.path.notExists
+
+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.addCommit(vararg args: String) {
+    this("add", ".").executeSilently(silenceErr = true)
+    this("commit", "-m", *args).executeSilently(silenceErr = true)
+}

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

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

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

@@ -0,0 +1,7 @@
+package org.plazmamc.alwaysuptodate.utils
+
+import io.papermc.paperweight.util.path
+import org.gradle.api.Project
+import java.nio.file.Path
+
+val Project.pathIO: Path get() = layout.projectDirectory.path

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

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

gradle.properties

@@ -1,8 +1,10 @@
+version = 1.20.4-R0.1-SNAPSHOT
+mcVersion = 1.20.4
+
+paperCommit = 850b736e1442587230bbba241f99eb0cee193cd9
+purpurCommit = d80fbedf5d8a8830aa895595114ec1979fc0a3f7
+
 group = org.plazmamc.plazma
-version = 1.20.2-R0.1-SNAPSHOT
-
-paperCommit = 38376f43a0c268e5223746cab13910f55e5ecf41
-
 org.gradle.caching = true
 org.gradle.parallel = true
 org.gradle.vfs.watch = false

gradle/libs.versions.toml

@@ -0,0 +1,15 @@
+[versions]
+shadow = "8.1.1"
+paperweight = "1.5.11"
+paperclip = "3.0.3"
+decompiler = "2.0.627.2"
+remapper = "0.10.0"
+
+[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" }
+
+[plugins]
+shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
+paperweight = { id = "io.papermc.paperweight.patcher", version.ref = "paperweight" }

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -141,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

libs/api.versions.toml

@@ -0,0 +1,29 @@
+[versions]
+gson = "2.10.1"
+joml = "1.10.5"
+guava = "32.1.2-jre"
+sentry = "5.4.0"
+fastutil = "8.5.6"
+findbugs = "1.3.9"
+slf4j-api = "2.0.9"
+bungeechat = "1.20-R0.2"
+json-simple = "1.1.1"
+annotations = "24.0.1"
+checkerqual = "3.21.0"
+
+[libraries]
+joml = { group = "org.joml", name = "joml", version.ref = "joml" }
+gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
+guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
+sentry = { group = "io.sentry", name = "sentry", version.ref = "sentry" }
+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" }
+jsonsimple = { group = "com.googlecode.json-simple", name = "json-simple", version.ref = "json-simple" }
+annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }
+checkerqual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checkerqual" }
+
+[bundles]
+api = [ "guava", "gson", "bungeechat", "joml", "fastutil", "slf4j-api", "sentry" ]
+annotations = [ "annotations", "checkerqual" ]

libs/common.versions.toml

@@ -0,0 +1,45 @@
+[versions]
+asm = "9.6"
+log4j = "2.19.0"
+mockito = "5.5.0"
+jupiter = "5.10.0"
+hamcrest = "2.2"
+snakeyaml = "2.2"
+adventure = "4.15.0"
+commons-lang2 = "2.6"
+commons-lang3 = "3.12.0"
+maven-provider = "3.9.6"
+maven-resolver = "1.9.18"
+
+[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-serializer-gson = { group = "net.kyori", name = "adventure-text-serializer-gson", version.ref = "adventure" }
+adventure-serializer-ansi = { group = "net.kyori", name = "adventure-text-serializer-ansi", version.ref = "adventure" }
+adventure-serializer-plain = { group = "net.kyori", name = "adventure-text-serializer-plain", version.ref = "adventure" }
+adventure-serializer-legacy = { group = "net.kyori", name = "adventure-text-serializer-legacy", version.ref = "adventure" }
+
+[bundles]
+asm = [ "asm-head", "asm-commons" ]
+test = [ "jupiter", "hamcrest", "mockito", "asm-tree" ]
+maven = [ "maven-connector", "maven-transport" ]
+adventure = [ "adventure-api", "adventure-slf4j", "adventure-minimessage", "adventure-serializer-gson", "adventure-serializer-plain", "adventure-serializer-legacy" ]

libs/server.versions.toml

@@ -0,0 +1,38 @@
+[versions]
+ansi = "1.0.3"
+jansi = "3.21.0"
+rhino = "1.7.14"
+mysql = "8.2.0"
+sqlite = "3.42.0.1"
+pioneer = "2.2.0"
+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"
+
+[libraries]
+ansi = { group = "net.kyori", name = "ansi", version.ref = "ansi" }
+mysql = { group = "com.mysql", name = "mysql-connector-j", version.ref = "mysql" }
+jansi = { group = "org.jline", name = "jline-terminal-jansi", version.ref = "jansi" }
+sqlite = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite" }
+pioneer = { group = "org.junit-pioneer", name = "junit-pioneer", version.ref = "pioneer" }
+haproxy = { group = "io.netty", name = "netty-codec-haproxy", version.ref = "haproxy" }
+velocity = { group = "com.velocitypowered", name = "velocity-native", version.ref = "velocity" }
+disruptor = { group = "com.lmax", name = "disruptor", version.ref = "disruptor" }
+mappingio = { group = "net.fabricmc", name = "mapping-io", version.ref = "mapping-io" }
+classgraph = { group = "io.github.classgraph", name = "classgraph", version.ref = "classgraph" }
+simpleyaml = { group = "com.github.carleslc.Simple-YAML", name = "Simple-Yaml", version.ref = "simpleyaml" }
+configurate = { group = "org.spongepowered", name = "configurate-yaml", version.ref = "configurate" }
+
+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" }
+
+[bundles]
+runtime = [ "sqlite", "mysql", "disruptor" ]
+implementation = [ "jansi", "terminal-appender", "ansi", "haproxy", "configurate", "mappingio", "rhino-engine", "rhino-runtime" ]
+test = [ "classgraph", "pioneer" ]

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

@@ -1,10 +1,10 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kevin Raneri <kevin.raneri@gmail.com>
-Date: Sat, 30 Sep 2023 09:45:48 +0000
+Date: Tue, 9 Nov 2021 14:01:56 -0500
 Subject: [PATCH] Pufferfish API Changes
 
-Original: Kevin Raneri <kevin.raneri@gmail.com>
-Copyright (C) 2023 Pufferfish Studios LLC
+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
@@ -20,32 +20,37 @@ 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 639651972fddce4dff63a0f0a7e566a15b9e2dd6..6c0df825238ca037abeb2ba619983b6f554180ea 100644
+index bf01892c248b988531d21d9fb0f74d0adf2205ac..80833c13a2d19e31d6f648e7ef5b3456025e767e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -46,6 +46,7 @@ dependencies {
+@@ -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.4")
-     implementation("org.ow2.asm:asm-commons:9.4")
-@@ -102,6 +103,8 @@ tasks.jar {
+     implementation("org.ow2.asm:asm:9.5")
+     implementation("org.ow2.asm:asm-commons:9.5")
+@@ -109,6 +110,13 @@ val generateApiVersioningFile by tasks.registering {
+     }
+ }
  
- tasks.withType<Javadoc> {
-     val options = options as StandardJavadocDocletOptions
-+    options.addStringOption("-add-modules", "jdk.incubator.vector") // Pufferfish
-+    options.addStringOption("Xdoclint:none", "-quiet") // Pufferfish
-     options.overview = "src/main/javadoc/overview.html"
-     options.use()
-     options.isDocFilesSubDirs = true
++// 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..ff42019da93c365ea1365e2e0f7c51b196a10948
+index 0000000000000000000000000000000000000000..10310fdd53de28efb8a8250f6d3b0c8eb08fb68a
 --- /dev/null
 +++ b/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java
-@@ -0,0 +1,162 @@
+@@ -0,0 +1,161 @@
 +package gg.pufferfish.pufferfish.sentry;
 +
 +import com.google.gson.Gson;
@@ -61,7 +66,6 @@ index 0000000000000000000000000000000000000000..ff42019da93c365ea1365e2e0f7c51b1
 +import org.bukkit.event.player.PlayerEvent;
 +import org.bukkit.plugin.Plugin;
 +import org.bukkit.plugin.RegisteredListener;
-+import org.jetbrains.annotations.NotNull;
 +import org.jetbrains.annotations.Nullable;
 +
 +public class SentryContext {
@@ -94,7 +98,7 @@ index 0000000000000000000000000000000000000000..ff42019da93c365ea1365e2e0f7c51b1
 +		ThreadContext.remove("pufferfishsentry_playerid");
 +	}
 +	
-+	public static void setEventContext(@NotNull Event event, @NotNull RegisteredListener registration) {
++	public static void setEventContext(Event event, RegisteredListener registration) {
 +		setPluginContext(registration.getPlugin());
 +		
 +		try {
@@ -167,43 +171,43 @@ index 0000000000000000000000000000000000000000..ff42019da93c365ea1365e2e0f7c51b1
 +		private Event event;
 +		private RegisteredListener registeredListener;
 +		
-+		public @Nullable Plugin getPlugin() {
++		public Plugin getPlugin() {
 +			return plugin;
 +		}
 +		
-+		public void setPlugin(@Nullable Plugin plugin) {
++		public void setPlugin(Plugin plugin) {
 +			this.plugin = plugin;
 +		}
 +		
-+		public @Nullable Command getCommand() {
++		public Command getCommand() {
 +			return command;
 +		}
 +		
-+		public void setCommand(@Nullable Command command) {
++		public void setCommand(Command command) {
 +			this.command = command;
 +		}
 +		
-+		public @Nullable String getCommandLine() {
++		public String getCommandLine() {
 +			return commandLine;
 +		}
 +		
-+		public void setCommandLine(@Nullable String commandLine) {
++		public void setCommandLine(String commandLine) {
 +			this.commandLine = commandLine;
 +		}
 +		
-+		public @Nullable Event getEvent() {
++		public Event getEvent() {
 +			return event;
 +		}
 +		
-+		public void setEvent(@Nullable Event event) {
++		public void setEvent(Event event) {
 +			this.event = event;
 +		}
 +		
-+		public @Nullable RegisteredListener getRegisteredListener() {
++		public RegisteredListener getRegisteredListener() {
 +			return registeredListener;
 +		}
 +		
-+		public void setRegisteredListener(@Nullable RegisteredListener registeredListener) {
++		public void setRegisteredListener(RegisteredListener registeredListener) {
 +			this.registeredListener = registeredListener;
 +		}
 +	}
@@ -385,7 +389,7 @@ index 0000000000000000000000000000000000000000..ae2464920c9412ac90b819a540ee58be
 +	
 +}
 diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java
-index 3a9aaca2e76411a9c27f9f5e0f22d060d5a66d06..9584e245144b561b4f6745b2f26a4f69a6f92891 100644
+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 @@
@@ -476,10 +480,10 @@ index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..301e82369603f3dd6e6c1bd380da4bac
  
              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 13da387d3b59bc67c0d73e3fbd3a4034b1281527..7572a0bf6614b02be3cbccc7b86e52ee1b8df621 100644
+index 7e4f7cb2afbc145e532285c793573ad107bc3033..12449e18180d604e9cbbc744da74a8b222a18e1f 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-@@ -48,6 +48,8 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
+@@ -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
  
@@ -488,7 +492,7 @@ index 13da387d3b59bc67c0d73e3fbd3a4034b1281527..7572a0bf6614b02be3cbccc7b86e52ee
      static {
          ClassLoader.registerAsParallelCapable();
      }
-@@ -183,6 +185,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
+@@ -197,6 +199,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
          throw new ClassNotFoundException(name);
      }
  
@@ -496,7 +500,7 @@ index 13da387d3b59bc67c0d73e3fbd3a4034b1281527..7572a0bf6614b02be3cbccc7b86e52ee
      @Override
      protected Class<?> findClass(String name) throws ClassNotFoundException {
          if (name.startsWith("org.bukkit.") || name.startsWith("net.minecraft.")) {
-@@ -190,7 +193,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
+@@ -204,7 +207,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
          }
          Class<?> result = classes.get(name);
  
@@ -505,7 +509,7 @@ index 13da387d3b59bc67c0d73e3fbd3a4034b1281527..7572a0bf6614b02be3cbccc7b86e52ee
              String path = name.replace('.', '/').concat(".class");
              JarEntry entry = jar.getJarEntry(path);
  
-@@ -237,6 +240,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
+@@ -251,6 +254,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
              this.setClass(name, result); // Paper
          }
  
@@ -513,7 +517,7 @@ index 13da387d3b59bc67c0d73e3fbd3a4034b1281527..7572a0bf6614b02be3cbccc7b86e52ee
          return result;
      }
  
-@@ -251,6 +255,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
+@@ -265,6 +269,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
              // Paper end
              super.close();
          } finally {

patches/api/0002-Purpur-API-Changes.patch

@@ -1,10 +1,10 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 30 Sep 2023 09:53:53 +0000
+From: granny <contact@granny.dev>
+Date: Sun, 3 Mar 2024 00:58:34 +0000
 Subject: [PATCH] Purpur API Changes
 
-Original: PurpurMC
-Copyright (C) 2023 PurpurMC
+PurpurMC
+Copyright (C) 2024 PurpurMC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -24,6 +24,19 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 28a3ee2f2df6f93a894793abc03d357a9010a399..0588b113b02a05e946dd92fce489662bc01a41eb 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -129,6 +129,8 @@ tasks.jar {
+ }
+ 
+ tasks.withType<Javadoc> {
++    (options as StandardJavadocDocletOptions).addStringOption("-add-modules", "jdk.incubator.vector") // Purpur - our javadocs need this for pufferfish's SIMD patch
++    (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet") // Purpur - silence Paper's bajillion javadoc warnings
+     val options = options as StandardJavadocDocletOptions
+     options.overview = "src/main/javadoc/overview.html"
+     options.use()
 diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java
 index 8f29c1561ba5916cb5634392edd8bd2a5a294a51..6fbc64e0f214d0c8e5afcbe385e414a4e1fe1c72 100644
 --- a/src/main/java/co/aikar/timings/TimedEventExecutor.java
@@ -155,29 +168,6 @@ index e801e79fa57c44b2e5d359647c920f88064826f1..1abfcee0f6d632f4cd8d74b4994a90c9
              return StringUtil.copyPartialMatches(args[0], TIMINGS_SUBCOMMANDS,
                  new ArrayList<String>(TIMINGS_SUBCOMMANDS.size()));
          }
-diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 0c4dbb9ef63fa8575b5546239443cb2bd91ba847..b347224c223569297ee67ac630a710fdf28748ea 100644
---- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-+++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -198,6 +198,18 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
-     GoalKey<Mob> CLIMB_ON_TOP_OF_POWDER_SNOW = GoalKey.of(Mob.class, NamespacedKey.minecraft("climb_on_top_of_powder_snow"));
-     GoalKey<Wolf> WOLF_PANIC = GoalKey.of(Wolf.class, NamespacedKey.minecraft("wolf_panic"));
- 
-+    // Purpur start
-+    GoalKey<Mob> MOB_HAS_RIDER = GoalKey.of(Mob.class, NamespacedKey.minecraft("has_rider"));
-+    GoalKey<AbstractHorse> HORSE_HAS_RIDER = GoalKey.of(AbstractHorse.class, NamespacedKey.minecraft("horse_has_rider"));
-+    GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
-+    GoalKey<Phantom> FIND_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("find_crystal"));
-+    GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
-+    GoalKey<Drowned> DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager"));
-+    GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
-+    GoalKey<Wolf> AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf"));
-+    GoalKey<IronGolem> RECEIVE_FLOWER = GoalKey.of(IronGolem.class, NamespacedKey.minecraft("receive_flower"));
-+    // Purpur end
-+
-     /**
-      * @deprecated removed in 1.20.2
-      */
 diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
 index a736d7bcdc5861a01b66ba36158db1c716339346..22fc165fd9c95f0f3ae1be7a0857e48cc50fad5b 100644
 --- a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
@@ -196,10 +186,10 @@ index a736d7bcdc5861a01b66ba36158db1c716339346..22fc165fd9c95f0f3ae1be7a0857e48c
  
          @Override
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f78b5fd3c3347d28da58777bff88903d2eb140f6..584e3b08935f43beb27f478cc72229b6a5f40689 100644
+index ca27559cf4aa1c2e44fdca2022e213b1b1c80f4e..d218cd30fc0733a83e3e0ba3279eb21561b0b08e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2756,4 +2756,127 @@ public final class Bukkit {
+@@ -2862,4 +2862,127 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -418,10 +408,10 @@ index 918a045165cdcde264bc24082b7afebb407271de..687d11619379aead7f665d4a5f8f8bcc
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index da6e36a16e609272b60fc41ff69a6fa3c34926c0..eba4e7ebe3530fd8cb3ecbe72f703932df8721c9 100644
+index f9af60356da4668cec8b24e73f5747ab82e35a91..b304ad1307cdd6785653b1eab9781e070fb14c5a 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -11050,4 +11050,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -11557,4 +11557,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      public boolean isEnabledByFeature(@NotNull World world) {
          return Bukkit.getDataPackManager().isEnabledByFeature(this, world);
      }
@@ -463,13 +453,13 @@ index da6e36a16e609272b60fc41ff69a6fa3c34926c0..eba4e7ebe3530fd8cb3ecbe72f703932
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index bce07d84cafca677bb6fad78c21b82097f06430c..4ef0fa4f1ef72bb784674671473c6a322acadecc 100644
+index abb5109ed08a3a651c2c27d4d17a3d49eb06da1e..98308b759907e03b168f7e06704a91925ffcd3fd 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -522,4 +522,114 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -545,4 +545,106 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       */
      @Nullable
-     public Location getLastDeathLocation();
+     public Location getLocation();
 +
 +    // Purpur start - OfflinePlayer API
 +    /**
@@ -537,14 +527,6 @@ index bce07d84cafca677bb6fad78c21b82097f06430c..4ef0fa4f1ef72bb784674671473c6a32
 +    public float getWalkSpeed();
 +
 +    /**
-+     * Gets the entity's current position
-+     *
-+     * @return a new copy of Location containing the position of this offline player
-+     */
-+    @Nullable
-+    public Location getLocation();
-+
-+    /**
 +     * Sets OfflinePlayer's location. If player is online, it falls back to the Player#teleport implementation.
 +     *
 +     * @param destination
@@ -582,10 +564,10 @@ index bce07d84cafca677bb6fad78c21b82097f06430c..4ef0fa4f1ef72bb784674671473c6a32
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8d8fe04e6b09d2a5b1cc05002073df5c58cdcb96..aaef58468a3c31f35e5067ed4263e9dd3fbddddd 100644
+index b4f8281d3797ec825a7671f38077cd65d5a1d76e..be0e4c789a02d67160287c39cf6bdf8ef2229afc 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2121,6 +2121,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2214,6 +2214,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
  
@@ -604,7 +586,7 @@ index 8d8fe04e6b09d2a5b1cc05002073df5c58cdcb96..aaef58468a3c31f35e5067ed4263e9dd
          /**
           * Sends the component to the player
           *
-@@ -2404,4 +2416,105 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2497,4 +2509,105 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      boolean isOwnedByCurrentRegion(@NotNull Entity entity);
      // Paper end - Folia region threading API
@@ -711,10 +693,10 @@ index 8d8fe04e6b09d2a5b1cc05002073df5c58cdcb96..aaef58468a3c31f35e5067ed4263e9dd
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index da524a71af74b02515b037f7fe09ba6988e2c8bf..3679c3b8d31ab8de08ecabd56bf92ffc062f971c 100644
+index c5fe36050eeaff80cfb989fe2f38370215af6fe5..565ce4b0c5eb300953aaefa786b9f8938c771f2a 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4008,6 +4008,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4213,6 +4213,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public DragonBattle getEnderDragonBattle();
  
@@ -964,10 +946,10 @@ index 138d2530de2410f4a9424dabd3e5ce0cd1c1dcd2..10a8d64ad2da0be2c14f34c3e7d1957c
      // Paper start
      /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 762cb07861ca8ff058ce8d57ea6c15df1e588bf3..98de85d1382fe84cdc2e2c9db04bf1b4f157291c 100644
+index d9929d9311e4b2b0ae13a8f6f13563257263f298..a36fc32dd83339b6939cb4046538ec6285042397 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1049,4 +1049,55 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1104,4 +1104,55 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      @NotNull String getScoreboardEntryName();
      // Paper end - entity scoreboard name
@@ -1049,7 +1031,7 @@ index 655e37cb3a09610a3f3df805d6dcad17d722da62..09fd716c8fc9ea34a1cbf87bcbe22df0
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index 58017fce436cdbda255f7172fbdadb726d4b113c..05600fc8bf2a61aca8094029bc4c208a710da952 100644
+index bcc6ba95bd21c7972865838c636a03f50b6c1f1a..c3fcd8dd7dbb1e1a18e17c014c1e641149ea5960 100644
 --- a/src/main/java/org/bukkit/entity/Item.java
 +++ b/src/main/java/org/bukkit/entity/Item.java
 @@ -153,4 +153,62 @@ public interface Item extends Entity, io.papermc.paper.entity.Frictional { // Pa
@@ -1116,10 +1098,10 @@ index 58017fce436cdbda255f7172fbdadb726d4b113c..05600fc8bf2a61aca8094029bc4c208a
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 19e58e62ae442ef9be02ca7fa2f55e370a54afa4..994e026d68fcda9a4c34a8b161a06623f4437dff 100644
+index e67455efc84f1e06d3396291d104ce65fee4591b..744b869c028324d5de30d2d64ab080b050fa3c47 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1192,4 +1192,41 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1310,4 +1310,41 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void setBodyYaw(float bodyYaw);
      // Paper end
@@ -1187,10 +1169,10 @@ index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 20fa1024f9ad8f478a347be5c554b5e45b398a1c..0df709ed758401f04b3f565dc1f6492a55f5363c 100644
+index 254a02ddb5dc867c9dd6c2086791f7ab94247fd3..6dc63bfe85d83a7cff369f06c57ebe0aa04c63a3 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3278,4 +3278,122 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3687,4 +3687,123 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end
@@ -1219,6 +1201,7 @@ index 20fa1024f9ad8f478a347be5c554b5e45b398a1c..0df709ed758401f04b3f565dc1f6492a
 +
 +    /**
 +     * Reset the idle timer back to 0
++     * @deprecated Use {@link #resetIdleDuration()} instead
 +     */
 +    void resetIdleTimer();
 +
@@ -1407,6 +1390,20 @@ index 84db38388bf7a58e66d6cd29620b4fe64b0a897e..82ebd99549ce9f9e6427a50cef424e90
 +    public void setRabid(boolean rabid);
 +    // Purpur end
  }
+diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
+index 446b3ffd5caca5344be1c250475679834cd0d4a2..3da8d3d8925cd7a111c0c357bceecfd3a801c8eb 100644
+--- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
++++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
+@@ -303,7 +303,8 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
+         WORLD_BORDER,
+         /**
+          * Damage caused when an entity contacts a block such as a Cactus,
+-         * Dripstone (Stalagmite) or Berry Bush.
++         * Dripstone (Stalagmite) or Berry Bush. (Stonecutters too if you
++         * have the Stonecutter damage Purpur feature enabled)
+          * <p>
+          * Damage: variable
+          */
 diff --git a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java b/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
 index c9f395064656dd0126410eb3c6e197baa450c063..13156a12e5df50cdc1e465dc0bd9d94108275629 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
@@ -1425,10 +1422,10 @@ index c9f395064656dd0126410eb3c6e197baa450c063..13156a12e5df50cdc1e465dc0bd9d941
           * When a player gets bad omen after killing a patrol captain.
           */
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index cbce826add9dc2b3187c7bea00c27b785d7517df..3a98de6407d9a6307f89c207be1f09e639385ebe 100644
+index daa1306a7324d946d66ad5a674bbc84371d8d4d6..f3b2d7b6fda051211add2b3215f120fb6911aeed 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -151,7 +151,7 @@ public enum InventoryType {
+@@ -165,7 +165,7 @@ public enum InventoryType {
      SMITHING_NEW(4, "Upgrade Gear"),
      ;
  
@@ -1454,10 +1451,29 @@ index c60be4fd24c7fdf65251dd6169e5e1ac3b588d95..569deccd2f1cf21da9b5906433ac493c
 +    boolean canDoUnsafeEnchants();
 +
 +    void setDoUnsafeEnchants(boolean canDoUnsafeEnchants);
++    // Purpur end
+ }
+diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
+index f680545b6b59bf8d2ad154b0472dda4cba42a162..58a62ba0635f9158bf18043da89aba7521e0e2e1 100644
+--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
++++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
+@@ -353,4 +353,14 @@ public interface ItemFactory {
+      */
+     @NotNull ItemStack enchantWithLevels(@NotNull ItemStack itemStack, @org.jetbrains.annotations.Range(from = 1, to = 30) int levels, boolean allowTreasure, @NotNull java.util.Random random);
+     // Paper end - enchantWithLevels API
++
++    // Purpur start
++    /**
++     * Returns the lines of text shown when hovering over an item
++     * @param itemStack The ItemStack
++     * @param advanced Whether advanced tooltips are shown
++     * @return the list of Components
++     */
++    @NotNull java.util.List<net.kyori.adventure.text.@NotNull Component> getHoverLines(@NotNull ItemStack itemStack, boolean advanced);
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 0af73cc04edb93b9772136d4d808f657ea40e733..c733206b769d7a55076d863757fcac1a129033b7 100644
+index 245a730a54c4b241a9a67eccceefafd2763bd238..54dd0bd043a37f6519fc8a318856a4825d389669 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;
@@ -1479,10 +1495,10 @@ index 0af73cc04edb93b9772136d4d808f657ea40e733..c733206b769d7a55076d863757fcac1a
  
  /**
   * Represents a stack of items.
-@@ -1005,4 +1017,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
-         return type.isAir() || amount <= 0;
+@@ -1033,4 +1045,635 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+         return Bukkit.getUnsafe().computeTooltipLines(this, tooltipContext, player);
      }
-     // Paper end
+     // Paper end - expose itemstack tooltip lines
 +
 +    // Purpur start
 +    /**
@@ -2104,10 +2120,19 @@ index 0af73cc04edb93b9772136d4d808f657ea40e733..c733206b769d7a55076d863757fcac1a
 +        }
 +        return random.nextInt(unbreaking + 1) > 0;
 +    }
++
++    /**
++     * Returns the lines of text shown when hovering over the item
++     * @param advanced Whether advanced tooltips are shown
++     * @return the list of Components
++     */
++    public @NotNull List<net.kyori.adventure.text.@NotNull Component> getHoverLines(boolean advanced) {
++        return Bukkit.getItemFactory().getHoverLines(this, advanced);
++    }
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/RecipeChoice.java b/src/main/java/org/bukkit/inventory/RecipeChoice.java
-index 523818cbb0d6c90481ec97123e7fe0e2ff4eea14..bfeb8171a723d84b94bfaacd8aaf7d4d48ecd051 100644
+index db8bcc66bdc4bedfffb4705db6338eda4c0ad29a..feda3ddfaaf37b6ee218a0e0b1fbc199899bd364 100644
 --- a/src/main/java/org/bukkit/inventory/RecipeChoice.java
 +++ b/src/main/java/org/bukkit/inventory/RecipeChoice.java
 @@ -10,6 +10,7 @@ import java.util.function.Predicate;
@@ -2204,10 +2229,10 @@ index 301e82369603f3dd6e6c1bd380da4bacacd7ef6c..0c6ca7588fb3d6b6497ddf032fe75e5c
      /**
       * This class was not meant to be constructed explicitly
 diff --git a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
-index e4b6f278a811acbb0070e311c5c3bdaff7b00474..ee83ecb054099cb85168a9499dfe967a0a9ec796 100644
+index 653135352c104a6ddeb74a1b6d4916c6952d6271..46b0d02aa759b3735e6ac811523d459cf263aa8b 100644
 --- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
-@@ -65,6 +65,7 @@ public class LibraryLoader
+@@ -66,6 +66,7 @@ public class LibraryLoader
              @Override
              public void transferStarted(@NotNull TransferEvent event) throws TransferCancelledException
              {
@@ -2215,7 +2240,7 @@ index e4b6f278a811acbb0070e311c5c3bdaff7b00474..ee83ecb054099cb85168a9499dfe967a
                  logger.log( Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName() );
              }
          } );
-@@ -80,6 +81,7 @@ public class LibraryLoader
+@@ -81,6 +82,7 @@ public class LibraryLoader
          {
              return null;
          }
@@ -2223,7 +2248,7 @@ index e4b6f278a811acbb0070e311c5c3bdaff7b00474..ee83ecb054099cb85168a9499dfe967a
          logger.log( Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[]
          {
              java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), desc.getLibraries().size() // Paper - use configured log prefix
-@@ -118,6 +120,7 @@ public class LibraryLoader
+@@ -119,6 +121,7 @@ public class LibraryLoader
              }
  
              jarFiles.add( url );
@@ -2232,10 +2257,10 @@ index e4b6f278a811acbb0070e311c5c3bdaff7b00474..ee83ecb054099cb85168a9499dfe967a
              {
                  java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), file // Paper - use configured log prefix
 diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java
-index 037af5fd6d71a526c0e6620f2db0cd6df9625261..939ed1931492854c5854cab06730cf235eba7e89 100644
+index c8ab330ef171795d08fa201cf8320703c7f1c66b..93e2ea220dc03c122f82af65d5e9fda5b582290c 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffect.java
 +++ b/src/main/java/org/bukkit/potion/PotionEffect.java
-@@ -32,12 +32,14 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -33,6 +33,7 @@ public class PotionEffect implements ConfigurationSerializable {
      private static final String AMBIENT = "ambient";
      private static final String PARTICLES = "has-particles";
      private static final String ICON = "has-icon";
@@ -2243,34 +2268,46 @@ index 037af5fd6d71a526c0e6620f2db0cd6df9625261..939ed1931492854c5854cab06730cf23
      private final int amplifier;
      private final int duration;
      private final PotionEffectType type;
-     private final boolean ambient;
+@@ -40,6 +41,7 @@ public class PotionEffect implements ConfigurationSerializable {
      private final boolean particles;
      private final boolean icon;
+     private final PotionEffect hiddenEffect; // Paper
 +    @Nullable private final NamespacedKey key; // Purpur
  
      /**
       * Creates a potion effect.
-@@ -50,6 +52,36 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -50,11 +52,12 @@ public class PotionEffect implements ConfigurationSerializable {
+      * @param ambient the ambient status, see {@link PotionEffect#isAmbient()}
+      * @param particles the particle status, see {@link PotionEffect#hasParticles()}
+      * @param icon the icon status, see {@link PotionEffect#hasIcon()}
++     * @param key the namespacedKey, see {@link PotionEffect#getKey()}
+      * @param hiddenEffect the hidden PotionEffect
+      * @hidden Internal-- hidden effects are only shown internally
+      */
+     @org.jetbrains.annotations.ApiStatus.Internal // Paper
+-    public PotionEffect(@NotNull PotionEffectType type, int duration, int amplifier, boolean ambient, boolean particles, boolean icon, @Nullable PotionEffect hiddenEffect) { // Paper
++    public PotionEffect(@NotNull PotionEffectType type, int duration, int amplifier, boolean ambient, boolean particles, boolean icon, @Nullable PotionEffect hiddenEffect, @Nullable NamespacedKey key) { // Paper // Purpur
+         Preconditions.checkArgument(type != null, "effect type cannot be null");
+         this.type = type;
+         this.duration = duration;
+@@ -62,6 +65,7 @@ public class PotionEffect implements ConfigurationSerializable {
+         this.ambient = ambient;
+         this.particles = particles;
+         this.icon = icon;
++        this.key = key; // Purpur
+         // Paper start
+         this.hiddenEffect = hiddenEffect;
+     }
+@@ -77,10 +81,27 @@ public class PotionEffect implements ConfigurationSerializable {
       * @param icon the icon status, see {@link PotionEffect#hasIcon()}
       */
      public PotionEffect(@NotNull PotionEffectType type, int duration, int amplifier, boolean ambient, boolean particles, boolean icon) {
-+        // Purpur start
-+        this(type, duration, amplifier, ambient, particles, icon, null);
-+    }
-+
-+    /**
-+     * Create a potion effect.
-+     * @param duration measured in ticks, see {@link
-+     *     PotionEffect#getDuration()}
-+     * @param amplifier the amplifier, see {@link PotionEffect#getAmplifier()}
-+     * @param ambient the ambient status, see {@link PotionEffect#isAmbient()}
-+     * @param particles the particle status, see {@link PotionEffect#hasParticles()}
-+     * @param key the namespacedKey, see {@link PotionEffect#getKey()}
-+     */
-+    public PotionEffect(@NotNull PotionEffectType type, int duration, int amplifier, boolean ambient, boolean particles, @Nullable NamespacedKey key) {
-+        this(type, duration, amplifier, ambient, particles, particles, key);
-+    }
-+
+-        this(type, duration, amplifier, ambient, particles, icon, null);
++        this(type, duration, amplifier, ambient, particles, icon, null, null); // Purpur
+         // Paper end
+     }
+ 
++    // Purpur start
 +    /**
 +     * Creates a potion effect.
 +     * @param type effect type
@@ -2283,24 +2320,19 @@ index 037af5fd6d71a526c0e6620f2db0cd6df9625261..939ed1931492854c5854cab06730cf23
 +     * @param key the namespacedKey, see {@link PotionEffect#getKey()}
 +     */
 +    public PotionEffect(@NotNull PotionEffectType type, int duration, int amplifier, boolean ambient, boolean particles, boolean icon, @Nullable NamespacedKey key) {
-+        // Purpur end
-         Preconditions.checkArgument(type != null, "effect type cannot be null");
-         this.type = type;
-         this.duration = duration;
-@@ -57,6 +89,7 @@ public class PotionEffect implements ConfigurationSerializable {
-         this.ambient = ambient;
-         this.particles = particles;
-         this.icon = icon;
-+        this.key = key; // Purpur - add key
-     }
- 
++        this(type, duration, amplifier, ambient, particles, icon, null, key);
++    }
++    // Purpur end
++
      /**
-@@ -104,36 +137,43 @@ public class PotionEffect implements ConfigurationSerializable {
+      * Creates a potion effect with no defined color.
+      *
+@@ -126,33 +147,33 @@ public class PotionEffect implements ConfigurationSerializable {
       * @param map the map to deserialize from
       */
      public PotionEffect(@NotNull Map<String, Object> map) {
--        this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true), getBool(map, ICON, getBool(map, PARTICLES, true)));
-+        this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true), getBool(map, ICON, getBool(map, PARTICLES, true)), getKey(map)); // Purpur - getKey
+-        this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true), getBool(map, ICON, getBool(map, PARTICLES, true)), (PotionEffect) map.get(HIDDEN_EFFECT)); // Paper
++        this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true), getBool(map, ICON, getBool(map, PARTICLES, true)), (PotionEffect) map.get(HIDDEN_EFFECT), getKey(map)); // Paper // Purpur - getKey
      }
  
      // Paper start
@@ -2334,6 +2366,10 @@ index 037af5fd6d71a526c0e6620f2db0cd6df9625261..939ed1931492854c5854cab06730cf23
 -        return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon);
 +        return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon, key); // Purpur - add key
      }
+ 
+     /**
+@@ -169,6 +190,13 @@ public class PotionEffect implements ConfigurationSerializable {
+     }
      // Paper end
  
 +    // Purpur start
@@ -2346,7 +2382,7 @@ index 037af5fd6d71a526c0e6620f2db0cd6df9625261..939ed1931492854c5854cab06730cf23
      @NotNull
      private static PotionEffectType getEffectType(@NotNull Map<?, ?> map) {
          PotionEffectType effect;
-@@ -166,17 +206,33 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -201,6 +229,17 @@ public class PotionEffect implements ConfigurationSerializable {
          return def;
      }
  
@@ -2364,35 +2400,28 @@ index 037af5fd6d71a526c0e6620f2db0cd6df9625261..939ed1931492854c5854cab06730cf23
      @Override
      @NotNull
      public Map<String, Object> serialize() {
--        return ImmutableMap.<String, Object>builder()
-+        // Purpur start - add key, don't serialize if null.
-+        ImmutableMap.Builder<String, Object> builder = ImmutableMap.<String, Object>builder()
-             .put(TYPE, type.getKey().toString())
-             .put(DURATION, duration)
-             .put(AMPLIFIER, amplifier)
-             .put(AMBIENT, ambient)
-             .put(PARTICLES, particles)
--            .put(ICON, icon)
--            .build();
-+            .put(ICON, icon);
-+        if(key != null) {
+@@ -215,6 +254,11 @@ public class PotionEffect implements ConfigurationSerializable {
+         if (this.hiddenEffect != null) {
+             builder.put(HIDDEN_EFFECT, this.hiddenEffect);
+         }
++        // Purpur start
++        if (key != null) {
 +            builder.put(KEY, key.toString());
 +        }
-+        return builder.build();
 +        // Purpur end
+         return builder.build();
+         // Paper end
      }
- 
-     /**
-@@ -200,7 +256,7 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -243,7 +287,7 @@ public class PotionEffect implements ConfigurationSerializable {
              return false;
          }
          PotionEffect that = (PotionEffect) obj;
--        return this.type.equals(that.type) && this.ambient == that.ambient && this.amplifier == that.amplifier && this.duration == that.duration && this.particles == that.particles && this.icon == that.icon;
-+        return this.type.equals(that.type) && this.ambient == that.ambient && this.amplifier == that.amplifier && this.duration == that.duration && this.particles == that.particles && this.icon == that.icon && this.key == that.key; // Purpur - add key
+-        return this.type.equals(that.type) && this.ambient == that.ambient && this.amplifier == that.amplifier && this.duration == that.duration && this.particles == that.particles && this.icon == that.icon && java.util.Objects.equals(this.hiddenEffect, that.hiddenEffect); // Paper
++        return this.type.equals(that.type) && this.ambient == that.ambient && this.amplifier == that.amplifier && this.duration == that.duration && this.particles == that.particles && this.icon == that.icon && java.util.Objects.equals(this.hiddenEffect, that.hiddenEffect) && this.key == that.key; // Paper // Purpur - add key
      }
  
      /**
-@@ -296,6 +352,24 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -339,6 +383,24 @@ public class PotionEffect implements ConfigurationSerializable {
          return icon;
      }
  
@@ -2417,12 +2446,12 @@ index 037af5fd6d71a526c0e6620f2db0cd6df9625261..939ed1931492854c5854cab06730cf23
      @Override
      public int hashCode() {
          int hash = 1;
-@@ -310,6 +384,6 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -354,6 +416,6 @@ public class PotionEffect implements ConfigurationSerializable {
  
      @Override
      public String toString() {
--        return type.getName() + (ambient ? ":(" : ":") + duration + "t-x" + amplifier + (ambient ? ")" : "");
-+        return type.getName() + (ambient ? ":(" : ":") + duration + "t-x" + amplifier + (ambient ? ")" : "") + (hasKey() ? "(" + key + ")" : ""); // Purpur - add key if not null
+-        return "PotionEffect{" + "amplifier=" + amplifier + ", duration=" + duration + ", type=" + type + ", ambient=" + ambient + ", particles=" + particles + ", icon=" + icon + ", hiddenEffect=" + hiddenEffect + '}'; // Paper
++        return "PotionEffect{" + "amplifier=" + amplifier + ", duration=" + duration + ", type=" + type + ", ambient=" + ambient + ", particles=" + particles + ", icon=" + icon + ", hiddenEffect=" + hiddenEffect + ", key=" + key + '}'; // Paper // Purpur - add key
      }
  }
 diff --git a/src/main/java/org/bukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/util/permissions/CommandPermissions.java
@@ -4081,3 +4110,18 @@ index 12946bd55fcf7c40d39081779a7fa30049ee6165..9c2d605c50cbf9aefa56ec209df9f6ce
 +    public void stopTiming() { /*handler.stopTiming();*/ } // Purpur
  
  }
+diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
+index 88f1ca89fa640a686231b8eec87e70419b2d73ef..d6b91c49a267c89d7df2ddee7ccfe64675d117be 100644
+--- a/src/test/java/org/bukkit/AnnotationTest.java
++++ b/src/test/java/org/bukkit/AnnotationTest.java
+@@ -47,6 +47,10 @@ public class AnnotationTest {
+         "org/bukkit/plugin/java/PluginClassLoader",
+         // Generic functional interface
+         "org/bukkit/util/Consumer",
++        // Purpur start
++        "gg/pufferfish/pufferfish/sentry/SentryContext",
++        "gg/pufferfish/pufferfish/sentry/SentryContext$State",
++        // Purpur end
+         // Paper start
+         "io/papermc/paper/util/TransformingRandomAccessList",
+         "io/papermc/paper/util/TransformingRandomAccessList$TransformedListIterator",

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

@@ -0,0 +1,117 @@
+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,20 +5,20 @@ Subject: [PATCH] Plazma Configurations
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index aaef58468a3c31f35e5067ed4263e9dd3fbddddd..0852f1a18106a81a60726756aae1d9c2ba30b111 100644
+index be0e4c789a02d67160287c39cf6bdf8ef2229afc..2b3786560d8fb93b9899ebc1e0a7c96a808268d0 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2121,6 +2121,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2226,6 +2226,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
-         // Paper end
+         // Purpur end
  
-+        // Plazma start
++        // Plazma start - Plazma Configuration API
 +        @NotNull
-+        public org.bukkit.configuration.file.YamlConfiguration getPlazmaConfiguration() {
++        public org.bukkit.configuration.file.YamlConfiguration getPlazmaConfig() {
 +            throw new UnsupportedOperationException("Not supported yet.");
 +        }
 +        // Plazma end
 +
-         // Purpur start
-         @NotNull
-         public org.bukkit.configuration.file.YamlConfiguration getPurpurConfig() {
+         /**
+          * Sends the component to the player
+          *

patches/api/0004-Publish-Packages.patch

@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: IPECTER <ipectert@gmail.com>
-Date: Mon, 19 Jun 2023 18:19:50 +0900
-Subject: [PATCH] Publish-Packages
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 6c0df825238ca037abeb2ba619983b6f554180ea..54da0cab8681daac2dd9fbf0eb94de471819d4c8 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -171,3 +171,22 @@ tasks.check {
-     dependsOn(scanJar)
- }
- // Paper end
-+// Plazma start
-+publishing {
-+    repositories {
-+        maven {
-+            name = "githubPackage"
-+            url = uri("https://maven.pkg.github.com/PlazmaMC/Plazma")
-+
-+            credentials.username = System.getenv("GITHUB_USERNAME")
-+            credentials.password = System.getenv("GITHUB_TOKEN")
-+        }
-+
-+        publications {
-+            register<MavenPublication>("gpr") {
-+                from(components["java"])
-+            }
-+        }
-+    }
-+}
-+// Plazma end
-\ No newline at end of file

patches/api/0005-Optimize-spigot-event-bus.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize-spigot-event-bus
 
 
 diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java
-index 8ec56cd6b8e0f5c5dd8c7c88b4671e18dcf109d0..45b8ee1945202cc673905aab5c90985c01cb205e 100644
+index 8ec56cd6b8e0f5c5dd8c7c88b4671e18dcf109d0..f1b3559bf9d2023ca59330c65e6e34714759dd9d 100644
 --- a/src/main/java/org/bukkit/event/Event.java
 +++ b/src/main/java/org/bukkit/event/Event.java
 @@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull;
@@ -48,7 +48,7 @@ index 8ec56cd6b8e0f5c5dd8c7c88b4671e18dcf109d0..45b8ee1945202cc673905aab5c90985c
 +    public final @NotNull net.kyori.adventure.util.TriState asynchronous() {
 +        return this.async;
 +    }
-+    // Plazma end
++    // Plazma end - Optimize Spigot event bus
 +
      // Paper start
      /**

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

@@ -5,10 +5,10 @@ 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 2eb13c049fa917d41fa9ad17fdec9ec4c33701a8..5d50f83a76affc74f989870ca1bc8d7a75f3b2ba 100644
+index f7f864a2b46129e4d61bc87f3e23c343417aa094..eb3cc41388a210f000bf637bfae135081bee51e9 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
-@@ -215,6 +215,8 @@ public class PlayerKickEvent extends PlayerEvent implements Cancellable {
+@@ -216,6 +216,8 @@ public class PlayerKickEvent extends PlayerEvent implements Cancellable {
           * Fallback cause
           */
          UNKNOWN,

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

@@ -0,0 +1,19 @@
+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/generated-api/0001-Purpur-Generated-API-Changes.patch

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

patches/mojang-api/0001-Rebrand.patch

@@ -0,0 +1,19 @@
+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

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

@@ -0,0 +1,96 @@
+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-MC-Dev-fixes.patch

@@ -4,28 +4,8 @@ Date: Tue, 30 May 2023 12:12:29 +0900
 Subject: [PATCH] MC Dev fixes
 
 
-diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index b0b2cbd8d9db1772d43a285eca9060f3879acab0..8cde30544e14f8fc2dac32966ae3c21f8cf3a551 100644
---- a/src/main/java/com/destroystokyo/paper/Metrics.java
-+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
-@@ -604,15 +604,6 @@ 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
--                final String paperVersion;
--                final String implVersion = org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion();
--                if (implVersion != null) {
--                    final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1);
--                    paperVersion = "git-Pufferfish-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Pufferfish
--                } else {
--                    paperVersion = "unknown";
--                }
--                metrics.addCustomChart(new Metrics.SimplePie("pufferfish_version", () -> paperVersion)); // Pufferfish
- 
-                 metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
-                     Map<String, Map<String, Integer>> map = new HashMap<>();
 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..17d931ef47846b59e28dc0c5b5ae91396a1d3e7d 100644
+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 {

patches/server/0005-Rebrand.patch

@@ -1,33 +1,41 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <alphakr93@outlook.com>
+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 393dab1ece76e0ca1e0b58c0b2c72d5c1c41a84d..cfb74b11743ce2f7a78a6a8085f9dd05b65a3152 100644
+index be06b9b282c53bc135963447e19185d9ff41d19a..97b12b0b00bdf37ab122f8b8ea8b42ac65e30bce 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating
+@@ -13,12 +13,10 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
+ val alsoShade: Configuration by configurations.creating
  
  dependencies {
-     // Purpur start
+-    // 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("io.papermc.paper:paper-mojangapi:${project.version}") {
-         exclude("io.papermc.paper", "paper-api")
-     }
-@@ -87,7 +87,7 @@ tasks.jar {
++    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
++            "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..7d80d2cf5d607d6051e99e4b08bc1b76098a79da 100644
+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 {
@@ -35,7 +43,7 @@ index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..7d80d2cf5d607d6051e99e4b08bc1b76
              // 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
++                Metrics metrics = new Metrics("Plazma", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur // Plazma - Branding
  
                  metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
                      String minecraftVersion = Bukkit.getVersion();
@@ -44,44 +52,48 @@ index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..7d80d2cf5d607d6051e99e4b08bc1b76
                  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
++                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..fec95437c1ad602f64c4d4d02c276199f27babbd 100644
+index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..b04d3eea789f77b2435cb0192635f1be1bab597d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -20,7 +20,7 @@ import java.util.stream.StreamSupport;
+@@ -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
++    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;
-@@ -33,8 +33,8 @@ public class PaperVersionFetcher implements VersionFetcher {
++    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
-+        final Component updateMessage = getUpdateStatusMessage("PlazmaMC/Plazma", "ver/" + getMinecraftVersion(), parts[0]); // Purpur // Plazma
++        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 +47,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -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
++                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 +57,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -57,6 +58,7 @@ public class PaperVersionFetcher implements VersionFetcher {
      }
  
      private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
@@ -89,7 +101,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..fec95437c1ad602f64c4d4d02c276199
          //int distance; // Purpur - use field
          try {
              int jenkinsBuild = Integer.parseInt(versionInfo);
-@@ -65,6 +66,11 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -65,6 +67,11 @@ public class PaperVersionFetcher implements VersionFetcher {
              versionInfo = versionInfo.replace("\"", "");
              distance = fetchDistanceFromGitHub(repo, branch, versionInfo);
          }
@@ -97,11 +109,11 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..fec95437c1ad602f64c4d4d02c276199
 +         */
 +        versionInfo = versionInfo.replace("\"", ""); // Plazma
 +        distance = fetchDistanceFromGitHub(repo, branch, versionInfo); // Plazma
-+        // Plazma end
++        // Plazma end - Disable CI Checking
  
          switch (distance) {
              case -1:
-@@ -83,6 +89,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -83,6 +90,7 @@ public class PaperVersionFetcher implements VersionFetcher {
          }
      }
  
@@ -109,7 +121,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..fec95437c1ad602f64c4d4d02c276199
      private static int fetchDistanceFromSiteApi(int jenkinsBuild, @Nullable String siteApiVersion) {
          if (siteApiVersion == null) { return -1; }
          try {
-@@ -102,6 +109,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -102,6 +110,7 @@ public class PaperVersionFetcher implements VersionFetcher {
              return -1;
          }
      }
@@ -118,7 +130,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..fec95437c1ad602f64c4d4d02c276199
      // 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..19d1d136fc28d6c114f6bc44c6450d2df51c3cb9 100644
+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 {
@@ -126,37 +138,37 @@ index 3cb56595822799926a8141e60a42f5d1edfc6de5..19d1d136fc28d6c114f6bc44c6450d2d
      protected LineReader buildReader(LineReaderBuilder builder) {
          builder
 -                .appName("Purpur") // Purpur
-+                .appName("Plazma") // Purpur // Plazma
++                .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 ed3527612315e6e0649182ce4e1ae2834b0918a9..ae02c029f0169d30a34d4a4e65ea6cb4fa498111 100644
+index f91ea723a1c85f6cf8c4f6dd7f182b948c2f2e81..c5a3f9c2daf3da135cccecb757353534e1688821 100644
 --- a/src/main/java/net/minecraft/CrashReport.java
 +++ b/src/main/java/net/minecraft/CrashReport.java
-@@ -35,7 +35,7 @@ public class CrashReport {
+@@ -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
++        this.systemReport.setDetail("Plazma Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit // Plazma - Branding
      }
  
      public String getTitle() {
-@@ -125,7 +125,7 @@ public class CrashReport {
+@@ -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
++        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 27a238cc56702297c88fde0f379178222ccf6c5b..30fc258faa6f087cf3c91411b48116a3ac416031 100644
+index b4a009a1108758110181af3321a91b3ec9cf74dc..3e1079e9af85c62684ce19a7afaac5adc2167cb6 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -108,6 +108,18 @@ public class Main {
+@@ -105,6 +105,18 @@ public class Main {
              */ // CraftBukkit end
  
          try {
@@ -167,29 +179,42 @@ index 27a238cc56702297c88fde0f379178222ccf6c5b..30fc258faa6f087cf3c91411b48116a3
 +                    \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
 +                    """);
-+            LOGGER.warn("Warning! Plazma may cause unexpected problems, so be sure to test it thoroughly before using it on a public server.");
++            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 8c3942d9ce4f8a102a47bec74af5911760fda4e3..cf9f7d52b07cffd41293ba5a6fab3a7f77a2cf03 100644
+index b1dd8d66a524254a270a725f5f7a46f28e13b749..c7d748675b51ea69f31d87c74e4125a48a62ef48 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -914,7 +914,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -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
++            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 be7b3fe2dc84493dcde9e185717b0b7c7c2e9822..cfdaa744ff40c8a171ca9b36b305b326fc57c32c 100644
+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 {
@@ -197,7 +222,7 @@ index be7b3fe2dc84493dcde9e185717b0b7c7c2e9822..cfdaa744ff40c8a171ca9b36b305b326
          }
  
 -        final JFrame jframe = new JFrame("Purpur Minecraft server"); // Purpur
-+        final JFrame jframe = new JFrame("Plazma Minecraft server"); // Purpur // Plazma
++        final JFrame jframe = new JFrame("Plazma Minecraft server"); // Purpur // Plazma - Branding
          final MinecraftServerGui servergui = new MinecraftServerGui(server);
  
          jframe.setDefaultCloseOperation(2);
@@ -205,35 +230,22 @@ index be7b3fe2dc84493dcde9e185717b0b7c7c2e9822..cfdaa744ff40c8a171ca9b36b305b326
          jframe.pack();
          jframe.setLocationRelativeTo((Component) null);
          jframe.setVisible(true);
--        jframe.setName("Purpur Minecraft server"); // Paper // Purpur
-+        jframe.setName("Plazma Minecraft server"); // Paper // Purpur // Plazma
+-        jframe.setName("Purpur Minecraft server"); // Paper - Improve ServerGUI // Purpur
++        jframe.setName("Plazma Minecraft server"); // Paper - Improve ServerGUI // Purpur // Plazma - Branding
  
-         // Paper start - Add logo as frame image
+         // 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
++                    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/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 75622ee77096d7eb311df0fd16b70c0f6dae3ccc..0325eada6271f021b4cc6e398b6e3e75b915f8aa 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1321,7 +1321,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-             TickingBlockEntity tickingblockentity = (TickingBlockEntity) this.blockEntityTickers.get(tileTickPosition);
-             // Spigot start
-             if (tickingblockentity == null) {
--                this.getCraftServer().getLogger().severe("Spigot has detected a null entity and has removed it, preventing a crash");
-+                this.getCraftServer().getLogger().severe("Plazma has detected a null entity and has removed it, preventing a crash"); // Plazma
-                 tilesThisCycle--;
-                 continue;
-             }
 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 db571f658f636cdda1dcdbaffa0c4da67fae11ad..0ba8a251bf1f5a7a6f27823686bf0d636feba769 100644
+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 {
@@ -241,51 +253,73 @@ index db571f658f636cdda1dcdbaffa0c4da67fae11ad..0ba8a251bf1f5a7a6f27823686bf0d63
      // 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
++        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 final int DEFAULT_SIZE_THRESHOLD = 1024 * 8;
+     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 a7081f2ce7e001c9a75b620c55703a0218f6dc28..005c854a10f343cd7488b282de002249bf5c4ced 100644
+index 0a5867b01c1ebf21d9add1d4a2843d15b8e1acb7..694dc50e8446754b56b8e214b04c773ab01f06fc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -267,7 +267,7 @@ import javax.annotation.Nullable; // Paper
+@@ -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
++    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 465e63a5849e224d86e82ef6c31c99846245e63b..2a384f70d14189af1690caba35b8202da519caf9 100644
+index e3f724a19ab2f9821d84f9b03acf7c925c88f455..aeb862f55965d2a6dc138aa72f0aa9c9d8c8c79c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -912,7 +912,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -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
++        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 a4567188e2fe3f922bb6aeb71a2845d1a1be536f..267555c309c44067ac0e011784870bad802bc292 100644
+index ca8ae8e1c51b937dac916e0b0dc94b5e2e61efeb..6bab5f9e40987d1a8ca9c17118d2a14135df5dff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -501,7 +501,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -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
++                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..0e695ea608c4e4770f5491d54ad47616d4e857c6 100644
+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;
@@ -296,7 +330,7 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..0e695ea608c4e4770f5491d54ad47616
 -        String result = "Unknown-Version";
 -
 -        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.purpurmc.purpur/purpur-api/pom.properties"); // Pufferfish // Purpur
-+    // Plazma start
++    // 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");
@@ -319,10 +353,23 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..0e695ea608c4e4770f5491d54ad47616
 +    public static String getBukkitVersion() {
 +        return version;
      }
-+    // Plazma end
++    // 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 3633574e112f217b412217dd243a631dc4e9c40c..d0d31002562e728fa1a6c9bc81baa4534f11d365 100644
+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 {
@@ -330,12 +377,12 @@ index 3633574e112f217b412217dd243a631dc4e9c40c..d0d31002562e728fa1a6c9bc81baa453
      }
  
 -    public static String serverModName = "Purpur";
-+    public static String serverModName = "Plazma"; // Plazma
++    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 dbd502761ff6e6efb252bb41376a7ff028c73895..c765cb5dd8c3c1b668b7031e6c784ed9cf2d58e1 100644
+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
@@ -343,40 +390,40 @@ index dbd502761ff6e6efb252bb41376a7ff028c73895..c765cb5dd8c3c1b668b7031e6c784ed9
                  // 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
++                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
++                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
++                log.log( Level.SEVERE, "Plazma version: " + Bukkit.getServer().getVersion() ); // Purpur // Plazma - Branding
                  //
                  if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
                  {
-@@ -185,12 +185,12 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
+@@ -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
++                    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
-                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper // Paper - rewrite chunk system
++                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 );
-@@ -206,7 +206,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
+@@ -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
++                    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/0006-Rebrand-Logo.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <alphakr93@gmail.com>
+From: AlphaKR93 <dev@alpha93.kr>
 Date: Fri, 10 Mar 2023 22:08:56 +0900
 Subject: [PATCH] Rebrand Logo
 

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

@@ -1,68 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 27 Sep 2023 16:02:29 +0900
-Subject: [PATCH] Add more metrics
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 7d80d2cf5d607d6051e99e4b08bc1b76098a79da..fa88d48adc3aefcd823f431f099e46c94fd071a1 100644
---- a/src/main/java/com/destroystokyo/paper/Metrics.java
-+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
-@@ -636,16 +636,51 @@ public class Metrics {
-                     return map;
-                 }));
- 
-+                // Plazma start - Add more metrics
-+                metrics.addCustomChart(new DrilldownPie("datapacks", () -> {
-+                    int datapacks = Bukkit.getDatapackManager().getEnabledPacks().size();
-+                    Map<String, Integer> entry = Collections.singletonMap(String.valueOf(datapacks), 1);
-+
-+                    if (datapacks == 0) return Collections.singletonMap("0", entry);
-+                    else if (datapacks <= 5) return Collections.singletonMap("1-5", entry);
-+                    else if (datapacks <= 10) return Collections.singletonMap("6-10", entry);
-+                    else if (datapacks <= 25) return Collections.singletonMap("11-25", entry);
-+                    else if (datapacks <= 50) return Collections.singletonMap("26-50", entry);
-+                    return Collections.singletonMap("50+", entry);
-+                }));
-+
-+                List<Plugin> plugins = Arrays.stream(Bukkit.getPluginManager().getPlugins()).toList();
-+
-+                metrics.addCustomChart(new DrilldownPie("plugins", () -> {
-+                    int pluginCount = (int) plugins.stream().filter(Plugin::isEnabled).count();
-+                    Map<String, Integer> entry = Collections.singletonMap(String.valueOf(pluginCount), 1);
-+
-+                    if (pluginCount == 0) return Collections.singletonMap("0", entry);
-+                    else if (pluginCount <= 5) return Collections.singletonMap("1-5", entry);
-+                    else if (pluginCount <= 10) return Collections.singletonMap("6-10", entry);
-+                    else if (pluginCount <= 25) return Collections.singletonMap("11-25", entry);
-+                    else if (pluginCount <= 50) return Collections.singletonMap("26-50", entry);
-+                    return Collections.singletonMap("50+", entry);
-+                }));
-+
-+                metrics.addCustomChart(new DrilldownPie("disabled_plugins", () -> {
-+                    int disabled = (int) plugins.stream().filter(java.util.function.Predicate.not(Plugin::isEnabled)).count();
-+                    Map<String, Integer> entry = Collections.singletonMap(String.valueOf(disabled), 1);
-+
-+                    if (disabled == 0) return Collections.singletonMap("0 \uD83D\uDE0E", entry);
-+                    else if (disabled <= 5) return Collections.singletonMap("1-5", entry);
-+                    else if (disabled <= 10) return Collections.singletonMap("6-10", entry);
-+                    else if (disabled <= 25) return Collections.singletonMap("11-25", entry);
-+                    else if (disabled <= 50) return Collections.singletonMap("26-50", entry);
-+                    return Collections.singletonMap("50+ \uD83D\uDE2D", entry);
-+                }));
-+                // Plazma end
-+
-                 metrics.addCustomChart(new Metrics.DrilldownPie("legacy_plugins", () -> {
-                     Map<String, Map<String, Integer>> map = new HashMap<>();
- 
-                     // count legacy plugins
--                    int legacy = 0;
--                    for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
--                        if (CraftMagicNumbers.isLegacy(plugin.getDescription())) {
--                            legacy++;
--                        }
--                    }
-+                    int legacy = (int) plugins.stream().filter(p -> CraftMagicNumbers.isLegacy(p.getDescription())).count(); // Plazma
- 
-                     // insert real value as lower dimension
-                     Map<String, Integer> entry = new HashMap<>();

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

@@ -0,0 +1,99 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Sun, 5 Nov 2023 10:47:05 +0900
+Subject: [PATCH] Setup basic configuration sections
+
+
+diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+index 69c4d9cb0532621018f6cd99916c409fc150ab7e..f8dc4f4e2cbc8034e5e274e5b7245d4e2b4bf38b 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+@@ -3,6 +3,7 @@ package org.plazmamc.plazma.configurations;
+ import io.papermc.paper.configuration.Configuration;
+ import io.papermc.paper.configuration.ConfigurationPart;
+ import org.jetbrains.annotations.NotNull;
++import org.spongepowered.configurate.objectmapping.meta.PostProcess;
+ import org.spongepowered.configurate.objectmapping.meta.Setting;
+ 
+ @SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "InnerClassMayBeStatic"})
+@@ -23,4 +24,43 @@ public class GlobalConfiguration extends ConfigurationPart {
+     @Setting(Configuration.VERSION_FIELD)
+     int version = VERSION;
+ 
++    public Player player;
++    public class Player extends ConfigurationPart {
++
++
++    }
++
++    @Setting("world-generation")
++    public WorldGeneration worldgen;
++    public class WorldGeneration extends ConfigurationPart {
++
++
++    }
++
++    public Entity entity;
++    public class Entity extends ConfigurationPart {
++
++
++        @PostProcess
++        public void post() {
++        }
++
++    }
++
++    public World world;
++    public class World extends ConfigurationPart {
++
++
++        @PostProcess
++        public void post() {
++        }
++
++    }
++
++    public Miscellaneous misc;
++    public class Miscellaneous extends ConfigurationPart {
++
++
++    }
++
+ }
+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
+--- 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 {
+     @Setting(Configuration.VERSION_FIELD)
+     int version = VERSION;
+ 
++    public Miscellaneous misc;
++    public class Miscellaneous extends ConfigurationPart {
++
++
++    }
++
++    public Entity entity;
++    public class Entity extends ConfigurationPart {
++
++        public Phantom phantom;
++        public class Phantom extends ConfigurationPart {
++
++
++        }
++
++    }
++
++    public Structure structure;
++    public class Structure extends ConfigurationPart {
++
++        public NetherPortal netherPortal;
++        public class NetherPortal extends ConfigurationPart {
++
++
++        }
++
++    }
++
+ }

patches/server/0010-Add-option-to-allow-any-usernames.patch

@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 27 Sep 2023 16:59:14 +0900
-Subject: [PATCH] Add option to allow any usernames
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index b875f4af9dcb45bcad0ee59a958442ba673268fe..d38685f82d2e6c4e71179bf3a85a8b183aa6c44b 100644
---- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -161,6 +161,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
-     @Override
-     public void handleHello(ServerboundHelloPacket packet) {
-         Validate.validState(this.state == ServerLoginPacketListenerImpl.State.HELLO, "Unexpected hello packet", new Object[0]);
-+        if (!org.plazmamc.plazma.configurations.GlobalConfiguration.get().player.allowAnyUsername) // Plazma - Add option to allow any usernames
-         Validate.validState(ServerLoginPacketListenerImpl.isValidUsername(packet.name()), "Invalid characters in username", new Object[0]);
-         // Paper start - validate usernames
-         if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.performUsernameValidation) {
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 44df2c0a1ed3d006b455ba2a47d6bc9059d804e1..00c95194788d56f539d1c75e9a1ce48e950c096c 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -39,6 +39,8 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public Player player;
-     public class Player extends ConfigurationPart {
- 
-+        public boolean allowAnyUsername = false;
-+
-     }
- 
-     public ConsoleLogs consoleLogs;

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

@@ -0,0 +1,118 @@
+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-Always-agree-EULA-on-development-mode.patch

@@ -0,0 +1,18 @@
+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-Add-more-metrics.patch

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

patches/server/0012-Completely-remove-Mojang-Profiler.patch

@@ -1,944 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 27 Sep 2023 17:52:52 +0900
-Subject: [PATCH] Completely remove Mojang Profiler
-
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 11de2f237e6dd950b8ddba3d5cfe9066d09f0903..44248dc470d0882b7287debd1993cedf0f238aca 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -113,16 +113,16 @@ import net.minecraft.util.Unit;
- import net.minecraft.util.datafix.DataFixers;
- import net.minecraft.util.profiling.EmptyProfileResults;
- import net.minecraft.util.profiling.ProfileResults;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- import net.minecraft.util.profiling.ResultField;
--import net.minecraft.util.profiling.SingleTickProfiler;
-+//import net.minecraft.util.profiling.SingleTickProfiler; // Plazma - Completely remove profiler
- import net.minecraft.util.profiling.jfr.JvmProfiler;
- import net.minecraft.util.profiling.jfr.callback.ProfiledDuration;
--import net.minecraft.util.profiling.metrics.profiling.ActiveMetricsRecorder;
--import net.minecraft.util.profiling.metrics.profiling.InactiveMetricsRecorder;
--import net.minecraft.util.profiling.metrics.profiling.MetricsRecorder;
--import net.minecraft.util.profiling.metrics.profiling.ServerMetricsSamplersProvider;
--import net.minecraft.util.profiling.metrics.storage.MetricsPersister;
-+//import net.minecraft.util.profiling.metrics.profiling.ActiveMetricsRecorder; // Plazma - Completely remove profiler
-+//import net.minecraft.util.profiling.metrics.profiling.InactiveMetricsRecorder; // Plazma - Completely remove profiler
-+//import net.minecraft.util.profiling.metrics.profiling.MetricsRecorder; // Plazma - Completely remove profiler
-+//import net.minecraft.util.profiling.metrics.profiling.ServerMetricsSamplersProvider; // Plazma - Completely remove profiler
-+//import net.minecraft.util.profiling.metrics.storage.MetricsPersister; // Plazma - Completely remove profiler
- import net.minecraft.util.thread.ReentrantBlockableEventLoop;
- import net.minecraft.world.Difficulty;
- import net.minecraft.world.RandomSequences;
-@@ -214,11 +214,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     public LevelStorageSource.LevelStorageAccess storageSource;
-     public final PlayerDataStorage playerDataStorage;
-     private final List<Runnable> tickables = Lists.newArrayList();
--    private MetricsRecorder metricsRecorder;
--    private ProfilerFiller profiler;
--    private Consumer<ProfileResults> onMetricsRecordingStopped;
--    private Consumer<Path> onMetricsRecordingFinished;
--    private boolean willStartRecordingMetrics;
-+    //private MetricsRecorder metricsRecorder; // Plazma - Completely remove profiler
-+    //private ProfilerFiller profiler; // Plazma - Completely remove profiler
-+    //private Consumer<ProfileResults> onMetricsRecordingStopped; // Plazma - Completely remove profiler
-+    //private Consumer<Path> onMetricsRecordingFinished; // Plazma - Completely remove profiler
-+    //private boolean willStartRecordingMetrics; // Plazma - Completely remove profiler
-     @Nullable
-     private MinecraftServer.TimeProfiler debugCommandProfiler;
-     private boolean debugCommandProfilerDelayStart;
-@@ -2309,10 +2309,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         }
-     }
- 
-+    /* // Plazma - Completely remove profiler
-     public ProfilerFiller getProfiler() {
-         if (true || gg.pufferfish.pufferfish.PufferfishConfig.disableMethodProfiler) return net.minecraft.util.profiling.InactiveProfiler.INSTANCE; // Purpur
-         return this.profiler;
-     }
-+     */ // Plazma - Completely remove profiler
- 
-     public abstract boolean isSingleplayerOwner(GameProfile profile);
- 
-diff --git a/src/main/java/net/minecraft/server/ServerAdvancementManager.java b/src/main/java/net/minecraft/server/ServerAdvancementManager.java
-index ebcd2bbcf8f25c52de3deaff32a8522dbf662141..0ff246c5f7c6f02c12a55b1d9c7b35ad3fd4c1c0 100644
---- a/src/main/java/net/minecraft/server/ServerAdvancementManager.java
-+++ b/src/main/java/net/minecraft/server/ServerAdvancementManager.java
-@@ -22,7 +22,7 @@ import net.minecraft.resources.ResourceLocation;
- import net.minecraft.server.packs.resources.ResourceManager;
- import net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener;
- import net.minecraft.util.GsonHelper;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- import net.minecraft.world.level.storage.loot.LootDataManager;
- import org.slf4j.Logger;
- 
-@@ -39,7 +39,7 @@ public class ServerAdvancementManager extends SimpleJsonResourceReloadListener {
-         this.lootData = conditionManager;
-     }
- 
--    protected void apply(Map<ResourceLocation, JsonElement> prepared, ResourceManager manager, ProfilerFiller profiler) {
-+    protected void apply(Map<ResourceLocation, JsonElement> prepared, ResourceManager manager/*, ProfilerFiller profiler*/) { // Plazma - Completely remove profiler
-         Builder<ResourceLocation, AdvancementHolder> builder = ImmutableMap.builder();
- 
-         prepared.forEach((minecraftkey, jsonelement) -> {
-diff --git a/src/main/java/net/minecraft/server/ServerFunctionLibrary.java b/src/main/java/net/minecraft/server/ServerFunctionLibrary.java
-index 975422a57b83a31e63a600bb4ff9c4e2baaf6da7..6783dc11a321c244296e84223c51cd1a489a9b96 100644
---- a/src/main/java/net/minecraft/server/ServerFunctionLibrary.java
-+++ b/src/main/java/net/minecraft/server/ServerFunctionLibrary.java
-@@ -25,7 +25,7 @@ import net.minecraft.server.packs.resources.PreparableReloadListener;
- import net.minecraft.server.packs.resources.Resource;
- import net.minecraft.server.packs.resources.ResourceManager;
- import net.minecraft.tags.TagLoader;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- import net.minecraft.world.entity.Entity;
- import net.minecraft.world.phys.Vec2;
- import net.minecraft.world.phys.Vec3;
-@@ -62,7 +62,7 @@ public class ServerFunctionLibrary implements PreparableReloadListener {
-     }
- 
-     @Override
--    public CompletableFuture<Void> reload(PreparableReloadListener.PreparationBarrier synchronizer, ResourceManager manager, ProfilerFiller prepareProfiler, ProfilerFiller applyProfiler, Executor prepareExecutor, Executor applyExecutor) {
-+    public CompletableFuture<Void> reload(PreparableReloadListener.PreparationBarrier synchronizer, ResourceManager manager/*, ProfilerFiller prepareProfiler, ProfilerFiller applyProfiler*/, Executor prepareExecutor, Executor applyExecutor) { // Plazma - Completely remove profiler
-         CompletableFuture<Map<ResourceLocation, List<TagLoader.EntryWithSource>>> completableFuture = CompletableFuture.supplyAsync(() -> {
-             return this.tagsLoader.load(manager);
-         }, prepareExecutor);
-diff --git a/src/main/java/net/minecraft/server/ServerFunctionManager.java b/src/main/java/net/minecraft/server/ServerFunctionManager.java
-index 097ac55028d66ef9ab430ff5dd103db6e3b99fc7..2993e9f326c43ef3f06d5e332899f9fad1f03718 100644
---- a/src/main/java/net/minecraft/server/ServerFunctionManager.java
-+++ b/src/main/java/net/minecraft/server/ServerFunctionManager.java
-@@ -19,7 +19,7 @@ import net.minecraft.commands.FunctionInstantiationException;
- import net.minecraft.nbt.CompoundTag;
- import net.minecraft.network.chat.Component;
- import net.minecraft.resources.ResourceLocation;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- import net.minecraft.world.level.GameRules;
- 
- public class ServerFunctionManager {
-diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 3f4df62773dfe1045914325ce5bc13162192679c..0f27bdc25dc5246d98358a26e1d01e17bc779c2d 100644
---- a/src/main/java/net/minecraft/server/level/ChunkMap.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -68,7 +68,7 @@ import net.minecraft.server.level.progress.ChunkProgressListener;
- import net.minecraft.server.network.ServerPlayerConnection;
- import net.minecraft.util.CsvOutput;
- import net.minecraft.util.Mth;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- import net.minecraft.util.thread.BlockableEventLoop;
- import net.minecraft.util.thread.ProcessorHandle;
- import net.minecraft.util.thread.ProcessorMailbox;
-diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 6255960ae70e14eb11da5043eb003575e300ddf6..999f57366cad34f92a1f80437bf7bd84b40c0e6b 100644
---- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -24,7 +24,7 @@ import net.minecraft.core.SectionPos;
- import net.minecraft.network.protocol.Packet;
- import net.minecraft.server.level.progress.ChunkProgressListener;
- import net.minecraft.util.VisibleForDebug;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- import net.minecraft.util.thread.BlockableEventLoop;
- import net.minecraft.world.entity.Entity;
- import net.minecraft.world.entity.ai.village.poi.PoiManager;
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e7efdd572716e50ecca217898b8a368e5829f925..72c2af8638d71b92a9762dedb0efec53ce8094f7 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -77,7 +77,7 @@ import net.minecraft.util.Mth;
- import net.minecraft.util.ProgressListener;
- import net.minecraft.util.RandomSource;
- import net.minecraft.util.Unit;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- import net.minecraft.util.valueproviders.IntProvider;
- import net.minecraft.util.valueproviders.UniformInt;
- import net.minecraft.world.DifficultyInstance;
-@@ -694,15 +694,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         // Holder holder = worlddimension.type(); // CraftBukkit - decompile error
- 
-         // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
--        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)), spigotConfig -> minecraftserver.plazmaConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig)), executor); // Paper - Async-Anti-Xray - Pass executor // Plazma
-+        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)), spigotConfig -> minecraftserver.plazmaConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig)), executor); // Paper - Async-Anti-Xray - Pass executor // Plazma // Plazma - Completely remove profiler
-         this.pvpMode = minecraftserver.isPvpAllowed();
-         this.convertable = convertable_conversionsession;
-         this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
-         // CraftBukkit end
-         this.players = Lists.newArrayList();
-         this.entityTickList = new EntityTickList();
--        this.blockTicks = new LevelTicks<>(this::isPositionTickingWithEntitiesLoaded, this.getProfilerSupplier());
--        this.fluidTicks = new LevelTicks<>(this::isPositionTickingWithEntitiesLoaded, this.getProfilerSupplier());
-+        this.blockTicks = new LevelTicks<>(this::isPositionTickingWithEntitiesLoaded/*, this.getProfilerSupplier()*/); // Plazma - Completely remove profiler
-+        this.fluidTicks = new LevelTicks<>(this::isPositionTickingWithEntitiesLoaded/*, this.getProfilerSupplier()*/); // Plazma - Completely remove profiler
-         this.navigatingMobs = new ObjectOpenHashSet();
-         this.blockEvents = new ObjectLinkedOpenHashSet();
-         this.blockEventsToReschedule = new ArrayList(64);
-diff --git a/src/main/java/net/minecraft/server/packs/resources/PreparableReloadListener.java b/src/main/java/net/minecraft/server/packs/resources/PreparableReloadListener.java
-index 828196decc89e7e03f88c4a3208ee1ab2bb69242..c0088e0e566abb928c8dcd6f819d82cc1122589b 100644
---- a/src/main/java/net/minecraft/server/packs/resources/PreparableReloadListener.java
-+++ b/src/main/java/net/minecraft/server/packs/resources/PreparableReloadListener.java
-@@ -2,10 +2,10 @@ package net.minecraft.server.packs.resources;
- 
- import java.util.concurrent.CompletableFuture;
- import java.util.concurrent.Executor;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- 
- public interface PreparableReloadListener {
--    CompletableFuture<Void> reload(PreparableReloadListener.PreparationBarrier synchronizer, ResourceManager manager, ProfilerFiller prepareProfiler, ProfilerFiller applyProfiler, Executor prepareExecutor, Executor applyExecutor);
-+    CompletableFuture<Void> reload(PreparableReloadListener.PreparationBarrier synchronizer, ResourceManager manager/*, ProfilerFiller prepareProfiler, ProfilerFiller applyProfiler*/, Executor prepareExecutor, Executor applyExecutor); // Plazma - Completely remove profiler
- 
-     default String getName() {
-         return this.getClass().getSimpleName();
-diff --git a/src/main/java/net/minecraft/server/packs/resources/ResourceManagerReloadListener.java b/src/main/java/net/minecraft/server/packs/resources/ResourceManagerReloadListener.java
-index 7383c7d3820dce06108eaafd236a7c6c06a10a42..4e1f4e026cd7c566468a58b2ea232d5dee80b86f 100644
---- a/src/main/java/net/minecraft/server/packs/resources/ResourceManagerReloadListener.java
-+++ b/src/main/java/net/minecraft/server/packs/resources/ResourceManagerReloadListener.java
-@@ -3,11 +3,11 @@ package net.minecraft.server.packs.resources;
- import java.util.concurrent.CompletableFuture;
- import java.util.concurrent.Executor;
- import net.minecraft.util.Unit;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- 
- public interface ResourceManagerReloadListener extends PreparableReloadListener {
-     @Override
--    default CompletableFuture<Void> reload(PreparableReloadListener.PreparationBarrier synchronizer, ResourceManager manager, ProfilerFiller prepareProfiler, ProfilerFiller applyProfiler, Executor prepareExecutor, Executor applyExecutor) {
-+    default CompletableFuture<Void> reload(PreparableReloadListener.PreparationBarrier synchronizer, ResourceManager manager/*, ProfilerFiller prepareProfiler, ProfilerFiller applyProfiler*/, Executor prepareExecutor, Executor applyExecutor) { // Plazma - Completely remove profiler
-         return synchronizer.wait(Unit.INSTANCE).thenRunAsync(() -> {
-             //applyProfiler.startTick(); // Purpur
-             //applyProfiler.push("listener"); // Purpur
-diff --git a/src/main/java/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.java b/src/main/java/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.java
-index 9cc09f0415a09299102dbcf022326944368ea033..2e9e63f3ee6268cafa3b90666cf31019e7341dbb 100644
---- a/src/main/java/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.java
-+++ b/src/main/java/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.java
-@@ -11,7 +11,7 @@ import java.util.Map;
- import net.minecraft.resources.FileToIdConverter;
- import net.minecraft.resources.ResourceLocation;
- import net.minecraft.util.GsonHelper;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- import org.slf4j.Logger;
- 
- public abstract class SimpleJsonResourceReloadListener extends SimplePreparableReloadListener<Map<ResourceLocation, JsonElement>> {
-@@ -25,7 +25,7 @@ public abstract class SimpleJsonResourceReloadListener extends SimplePreparableR
-     }
- 
-     @Override
--    protected Map<ResourceLocation, JsonElement> prepare(ResourceManager resourceManager, ProfilerFiller profilerFiller) {
-+    protected Map<ResourceLocation, JsonElement> prepare(ResourceManager resourceManager/*, ProfilerFiller profilerFiller*/) { // Plazma - Completely remove Profiler
-         Map<ResourceLocation, JsonElement> map = new HashMap<>();
-         scanDirectory(resourceManager, this.directory, this.gson, map);
-         return map;
-diff --git a/src/main/java/net/minecraft/server/packs/resources/SimplePreparableReloadListener.java b/src/main/java/net/minecraft/server/packs/resources/SimplePreparableReloadListener.java
-index 7ab57748b2f2aea1003d9b7e70e76c372aa1e432..7de117e0464a24da632d134870554fd11e1b87ca 100644
---- a/src/main/java/net/minecraft/server/packs/resources/SimplePreparableReloadListener.java
-+++ b/src/main/java/net/minecraft/server/packs/resources/SimplePreparableReloadListener.java
-@@ -2,19 +2,19 @@ package net.minecraft.server.packs.resources;
- 
- import java.util.concurrent.CompletableFuture;
- import java.util.concurrent.Executor;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- 
- public abstract class SimplePreparableReloadListener<T> implements PreparableReloadListener {
-     @Override
--    public final CompletableFuture<Void> reload(PreparableReloadListener.PreparationBarrier synchronizer, ResourceManager manager, ProfilerFiller prepareProfiler, ProfilerFiller applyProfiler, Executor prepareExecutor, Executor applyExecutor) {
-+    public final CompletableFuture<Void> reload(PreparableReloadListener.PreparationBarrier synchronizer, ResourceManager manager/*, ProfilerFiller prepareProfiler, ProfilerFiller applyProfiler*/, Executor prepareExecutor, Executor applyExecutor) { // Plazma - Completely remove profiler
-         return CompletableFuture.supplyAsync(() -> {
--            return this.prepare(manager, prepareProfiler);
-+            return this.prepare(manager/*, prepareProfiler*/); // Plazma - Completely remove profiler
-         }, prepareExecutor).thenCompose(synchronizer::wait).thenAcceptAsync((prepared) -> {
--            this.apply(prepared, manager, applyProfiler);
-+            this.apply(prepared, manager/*, applyProfiler*/); // Plazma - Completely remove profiler
-         }, applyExecutor);
-     }
- 
--    protected abstract T prepare(ResourceManager manager, ProfilerFiller profiler);
-+    protected abstract T prepare(ResourceManager manager/*, ProfilerFiller profiler*/); // Plazma - Completely remove profiler
- 
--    protected abstract void apply(T prepared, ResourceManager manager, ProfilerFiller profiler);
-+    protected abstract void apply(T prepared, ResourceManager manager/*, ProfilerFiller profiler*/); // Plazma - Completely remove profiler
- }
-diff --git a/src/main/java/net/minecraft/server/packs/resources/SimpleReloadInstance.java b/src/main/java/net/minecraft/server/packs/resources/SimpleReloadInstance.java
-index de2ecc7c69fb870f843f60596115866214267ee4..05a731dec4aec1d3cf61a761bda018cc8c46afde 100644
---- a/src/main/java/net/minecraft/server/packs/resources/SimpleReloadInstance.java
-+++ b/src/main/java/net/minecraft/server/packs/resources/SimpleReloadInstance.java
-@@ -26,7 +26,7 @@ public class SimpleReloadInstance<S> implements ReloadInstance {
- 
-     public static SimpleReloadInstance<Void> of(ResourceManager manager, List<PreparableReloadListener> reloaders, Executor prepareExecutor, Executor applyExecutor, CompletableFuture<Unit> initialStage) {
-         return new SimpleReloadInstance<>(prepareExecutor, applyExecutor, manager, reloaders, (synchronizer, resourceManager, reloader, prepare, apply) -> {
--            return reloader.reload(synchronizer, resourceManager, InactiveProfiler.INSTANCE, InactiveProfiler.INSTANCE, prepareExecutor, apply);
-+            return reloader.reload(synchronizer, resourceManager/*, InactiveProfiler.INSTANCE, InactiveProfiler.INSTANCE*/, prepareExecutor, apply); // Plazma - Completely remove Profiler
-         }, initialStage);
-     }
- 
-diff --git a/src/main/java/net/minecraft/tags/TagManager.java b/src/main/java/net/minecraft/tags/TagManager.java
-index 60ed9413c32d91ce33583cc24998d08869d07a23..67c0d8f7294e18c7b2107b82219bc106608a21f0 100644
---- a/src/main/java/net/minecraft/tags/TagManager.java
-+++ b/src/main/java/net/minecraft/tags/TagManager.java
-@@ -14,7 +14,7 @@ import net.minecraft.resources.ResourceKey;
- import net.minecraft.resources.ResourceLocation;
- import net.minecraft.server.packs.resources.PreparableReloadListener;
- import net.minecraft.server.packs.resources.ResourceManager;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- 
- public class TagManager implements PreparableReloadListener {
-     private static final Map<ResourceKey<? extends Registry<?>>, String> CUSTOM_REGISTRY_DIRECTORIES = Map.of(Registries.BLOCK, "tags/blocks", Registries.ENTITY_TYPE, "tags/entity_types", Registries.FLUID, "tags/fluids", Registries.GAME_EVENT, "tags/game_events", Registries.ITEM, "tags/items");
-@@ -35,7 +35,7 @@ public class TagManager implements PreparableReloadListener {
-     }
- 
-     @Override
--    public CompletableFuture<Void> reload(PreparableReloadListener.PreparationBarrier synchronizer, ResourceManager manager, ProfilerFiller prepareProfiler, ProfilerFiller applyProfiler, Executor prepareExecutor, Executor applyExecutor) {
-+    public CompletableFuture<Void> reload(PreparableReloadListener.PreparationBarrier synchronizer, ResourceManager manager/*, ProfilerFiller prepareProfiler, ProfilerFiller applyProfiler*/, Executor prepareExecutor, Executor applyExecutor) { // Plazma - Completely remove profiler
-         List<? extends CompletableFuture<? extends TagManager.LoadResult<?>>> list = this.registryAccess.registries().map((registry) -> {
-             return this.createLoader(manager, prepareExecutor, registry);
-         }).toList();
-diff --git a/src/main/java/net/minecraft/util/profiling/ActiveProfiler.java b/src/main/java/net/minecraft/util/profiling/ActiveProfiler.java
-deleted file mode 100644
-index c6c30d99399c5cde2b0ec2f320d81d952b422d78..0000000000000000000000000000000000000000
---- a/src/main/java/net/minecraft/util/profiling/ActiveProfiler.java
-+++ /dev/null
-@@ -1,208 +0,0 @@
--package net.minecraft.util.profiling;
--
--import com.google.common.collect.Lists;
--import com.google.common.collect.Maps;
--import com.mojang.logging.LogUtils;
--import it.unimi.dsi.fastutil.longs.LongArrayList;
--import it.unimi.dsi.fastutil.longs.LongList;
--import it.unimi.dsi.fastutil.objects.Object2LongMap;
--import it.unimi.dsi.fastutil.objects.Object2LongMaps;
--import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
--import it.unimi.dsi.fastutil.objects.ObjectArraySet;
--import java.time.Duration;
--import java.util.List;
--import java.util.Map;
--import java.util.Set;
--import java.util.function.IntSupplier;
--import java.util.function.LongSupplier;
--import java.util.function.Supplier;
--import javax.annotation.Nullable;
--import net.minecraft.Util;
--import net.minecraft.util.profiling.metrics.MetricCategory;
--import org.apache.commons.lang3.tuple.Pair;
--import org.slf4j.Logger;
--
--public class ActiveProfiler implements ProfileCollector {
--    private static final long WARNING_TIME_NANOS = Duration.ofMillis(100L).toNanos();
--    private static final Logger LOGGER = LogUtils.getLogger();
--    private final List<String> paths = Lists.newArrayList();
--    private final LongList startTimes = new LongArrayList();
--    private final Map<String, ActiveProfiler.PathEntry> entries = Maps.newHashMap();
--    private final IntSupplier getTickTime;
--    private final LongSupplier getRealTime;
--    private final long startTimeNano;
--    private final int startTimeTicks;
--    private String path = "";
--    private boolean started;
--    @Nullable
--    private ActiveProfiler.PathEntry currentEntry;
--    private final boolean warn;
--    private final Set<Pair<String, MetricCategory>> chartedPaths = new ObjectArraySet<>();
--
--    public ActiveProfiler(LongSupplier timeGetter, IntSupplier tickGetter, boolean checkTimeout) {
--        this.startTimeNano = timeGetter.getAsLong();
--        this.getRealTime = timeGetter;
--        this.startTimeTicks = tickGetter.getAsInt();
--        this.getTickTime = tickGetter;
--        this.warn = checkTimeout;
--    }
--
--    @Override
--    public void startTick() {
--        if (this.started) {
--            LOGGER.error("Profiler tick already started - missing endTick()?");
--        } else {
--            this.started = true;
--            this.path = "";
--            this.paths.clear();
--            //this.push("root"); // Purpur
--        }
--    }
--
--    @Override
--    public void endTick() {
--        if (!this.started) {
--            LOGGER.error("Profiler tick already ended - missing startTick()?");
--        } else {
--            //this.pop(); // Purpur
--            this.started = false;
--            if (!this.path.isEmpty()) {
--                LOGGER.error("Profiler tick ended before path was fully popped (remainder: '{}'). Mismatched push/pop?", LogUtils.defer(() -> {
--                    return ProfileResults.demanglePath(this.path);
--                }));
--            }
--
--        }
--    }
--
--    @Override
--    public void push(String location) {
--        if (!this.started) {
--            LOGGER.error("Cannot push '{}' to profiler if profiler tick hasn't started - missing startTick()?", (Object)location);
--        } else {
--            if (!this.path.isEmpty()) {
--                this.path = this.path + "\u001e";
--            }
--
--            this.path = this.path + location;
--            this.paths.add(this.path);
--            this.startTimes.add(Util.getNanos());
--            this.currentEntry = null;
--        }
--    }
--
--    @Override
--    public void push(Supplier<String> locationGetter) {
--        //this.push(locationGetter.get()); // Purpur
--    }
--
--    @Override
--    public void markForCharting(MetricCategory type) {
--        this.chartedPaths.add(Pair.of(this.path, type));
--    }
--
--    @Override
--    public void pop() {
--        if (!this.started) {
--            LOGGER.error("Cannot pop from profiler if profiler tick hasn't started - missing startTick()?");
--        } else if (this.startTimes.isEmpty()) {
--            LOGGER.error("Tried to pop one too many times! Mismatched push() and pop()?");
--        } else {
--            long l = Util.getNanos();
--            long m = this.startTimes.removeLong(this.startTimes.size() - 1);
--            this.paths.remove(this.paths.size() - 1);
--            long n = l - m;
--            ActiveProfiler.PathEntry pathEntry = this.getCurrentEntry();
--            pathEntry.accumulatedDuration += n;
--            ++pathEntry.count;
--            pathEntry.maxDuration = Math.max(pathEntry.maxDuration, n);
--            pathEntry.minDuration = Math.min(pathEntry.minDuration, n);
--            if (this.warn && n > WARNING_TIME_NANOS) {
--                LOGGER.warn("Something's taking too long! '{}' took aprox {} ms", LogUtils.defer(() -> {
--                    return ProfileResults.demanglePath(this.path);
--                }), LogUtils.defer(() -> {
--                    return (double)n / 1000000.0D;
--                }));
--            }
--
--            this.path = this.paths.isEmpty() ? "" : this.paths.get(this.paths.size() - 1);
--            this.currentEntry = null;
--        }
--    }
--
--    @Override
--    public void popPush(String location) {
--        //this.pop(); // Purpur
--        //this.push(location); // Purpur
--    }
--
--    @Override
--    public void popPush(Supplier<String> locationGetter) {
--        //this.pop(); // Purpur
--        //this.push(locationGetter); // Purpur
--    }
--
--    private ActiveProfiler.PathEntry getCurrentEntry() {
--        if (this.currentEntry == null) {
--            this.currentEntry = this.entries.computeIfAbsent(this.path, (k) -> {
--                return new ActiveProfiler.PathEntry();
--            });
--        }
--
--        return this.currentEntry;
--    }
--
--    @Override
--    public void incrementCounter(String marker, int num) {
--        this.getCurrentEntry().counters.addTo(marker, (long)num);
--    }
--
--    @Override
--    public void incrementCounter(Supplier<String> markerGetter, int num) {
--        this.getCurrentEntry().counters.addTo(markerGetter.get(), (long)num);
--    }
--
--    @Override
--    public ProfileResults getResults() {
--        return new FilledProfileResults(this.entries, this.startTimeNano, this.startTimeTicks, this.getRealTime.getAsLong(), this.getTickTime.getAsInt());
--    }
--
--    @Nullable
--    @Override
--    public ActiveProfiler.PathEntry getEntry(String name) {
--        return this.entries.get(name);
--    }
--
--    @Override
--    public Set<Pair<String, MetricCategory>> getChartedPaths() {
--        return this.chartedPaths;
--    }
--
--    public static class PathEntry implements ProfilerPathEntry {
--        long maxDuration = Long.MIN_VALUE;
--        long minDuration = Long.MAX_VALUE;
--        long accumulatedDuration;
--        long count;
--        final Object2LongOpenHashMap<String> counters = new Object2LongOpenHashMap<>();
--
--        @Override
--        public long getDuration() {
--            return this.accumulatedDuration;
--        }
--
--        @Override
--        public long getMaxDuration() {
--            return this.maxDuration;
--        }
--
--        @Override
--        public long getCount() {
--            return this.count;
--        }
--
--        @Override
--        public Object2LongMap<String> getCounters() {
--            return Object2LongMaps.unmodifiable(this.counters);
--        }
--    }
--}
-diff --git a/src/main/java/net/minecraft/util/profiling/ProfilerFiller.java b/src/main/java/net/minecraft/util/profiling/ProfilerFiller.java
-deleted file mode 100644
-index 863343a87fe34d72f04af89d75268b477b2adc7a..0000000000000000000000000000000000000000
---- a/src/main/java/net/minecraft/util/profiling/ProfilerFiller.java
-+++ /dev/null
-@@ -1,116 +0,0 @@
--package net.minecraft.util.profiling;
--
--import java.util.function.Supplier;
--import net.minecraft.util.profiling.metrics.MetricCategory;
--
--public interface ProfilerFiller {
--    String ROOT = "root";
--
--    @io.papermc.paper.annotation.DoNotUse // Purpur
--    void startTick();
--
--    @io.papermc.paper.annotation.DoNotUse // Purpur
--    void endTick();
--
--    @io.papermc.paper.annotation.DoNotUse // Purpur
--    void push(String location);
--
--    @io.papermc.paper.annotation.DoNotUse // Purpur
--    void push(Supplier<String> locationGetter);
--
--    @io.papermc.paper.annotation.DoNotUse // Purpur
--    void pop();
--
--    @io.papermc.paper.annotation.DoNotUse // Purpur
--    void popPush(String location);
--
--    @io.papermc.paper.annotation.DoNotUse // Purpur
--    void popPush(Supplier<String> locationGetter);
--
--    @io.papermc.paper.annotation.DoNotUse // Purpur
--    void markForCharting(MetricCategory type);
--
--    @io.papermc.paper.annotation.DoNotUse // Purpur
--    default void incrementCounter(String marker) {
--        //this.incrementCounter(marker, 1); // Purpur
--    }
--
--    @io.papermc.paper.annotation.DoNotUse // Purpur
--    void incrementCounter(String marker, int num);
--
--    @io.papermc.paper.annotation.DoNotUse // Purpur
--    default void incrementCounter(Supplier<String> markerGetter) {
--        //this.incrementCounter(markerGetter, 1); // Purpur
--    }
--
--    @io.papermc.paper.annotation.DoNotUse // Purpur
--    void incrementCounter(Supplier<String> markerGetter, int num);
--
--    static ProfilerFiller tee(final ProfilerFiller a, final ProfilerFiller b) {
--        if (a == InactiveProfiler.INSTANCE) {
--            return b;
--        } else {
--            return b == InactiveProfiler.INSTANCE ? a : new ProfilerFiller() {
--                @Override
--                public void startTick() {
--                    //a.startTick(); // Purpur
--                    //b.startTick(); // Purpur
--                }
--
--                @Override
--                public void endTick() {
--                    //a.endTick(); // Purpur
--                    //b.endTick(); // Purpur
--                }
--
--                @Override
--                public void push(String location) {
--                    //a.push(location); // Purpur
--                    //b.push(location); // Purpur
--                }
--
--                @Override
--                public void push(Supplier<String> locationGetter) {
--                    //a.push(locationGetter); // Purpur
--                    //b.push(locationGetter); // Purpur
--                }
--
--                @Override
--                public void markForCharting(MetricCategory type) {
--                    //a.markForCharting(type); // Purpur
--                    //b.markForCharting(type); // Purpur
--                }
--
--                @Override
--                public void pop() {
--                    //a.pop(); // Purpur
--                    //b.pop(); // Purpur
--                }
--
--                @Override
--                public void popPush(String location) {
--                    //a.popPush(location); // Purpur
--                    //b.popPush(location); // Purpur
--                }
--
--                @Override
--                public void popPush(Supplier<String> locationGetter) {
--                    //a.popPush(locationGetter); // Purpur
--                    //b.popPush(locationGetter); // Purpur
--                }
--
--                @Override
--                public void incrementCounter(String marker, int num) {
--                    //a.incrementCounter(marker, num); // Purpur
--                    //b.incrementCounter(marker, num); // Purpur
--                }
--
--                @Override
--                public void incrementCounter(Supplier<String> markerGetter, int num) {
--                    //a.incrementCounter(markerGetter, num); // Purpur
--                    //b.incrementCounter(markerGetter, num); // Purpur
--                }
--            };
--        }
--    }
--}
-diff --git a/src/main/java/net/minecraft/util/profiling/metrics/profiling/MetricsRecorder.java b/src/main/java/net/minecraft/util/profiling/metrics/profiling/MetricsRecorder.java
-deleted file mode 100644
-index 729ebd1b2433327de243d0168289e180a841f47c..0000000000000000000000000000000000000000
---- a/src/main/java/net/minecraft/util/profiling/metrics/profiling/MetricsRecorder.java
-+++ /dev/null
-@@ -1,24 +0,0 @@
--package net.minecraft.util.profiling.metrics.profiling;
--
--import net.minecraft.util.profiling.ProfilerFiller;
--
--@Deprecated(forRemoval = true)
--public interface MetricsRecorder {
--    @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Purpur
--    void end();
--
--    @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Purpur
--    void cancel();
--
--    @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Purpur
--    void startTick();
--
--    @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Purpur
--    boolean isRecording();
--
--    @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Purpur
--    ProfilerFiller getProfiler();
--
--    @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Purpur
--    void endTick();
--}
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index d35afa8f8648bbcbfc044323bcda1b1182d7dce4..fb5c21ba15995d00da87ee6ef9e4ab8f6678d67f 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -147,8 +147,8 @@ public abstract class Mob extends LivingEntity implements Targeting {
-         this.pathfindingMalus = Maps.newEnumMap(BlockPathTypes.class);
-         this.restrictCenter = BlockPos.ZERO;
-         this.restrictRadius = -1.0F;
--        this.goalSelector = new GoalSelector(world.getProfilerSupplier());
--        this.targetSelector = new GoalSelector(world.getProfilerSupplier());
-+        this.goalSelector = new GoalSelector(/*world.getProfilerSupplier()*/); // Plazma - Completely remove profiler
-+        this.targetSelector = new GoalSelector(/*world.getProfilerSupplier()*/); // Plazma - Completely remove profiler
-         this.lookControl = new org.purpurmc.purpur.controller.LookControllerWASD(this); // Purpur
-         this.moveControl = new org.purpurmc.purpur.controller.MoveControllerWASD(this); // Purpur
-         this.jumpControl = new JumpControl(this);
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-index 02978315bc2b828cc603ce7478408f3f82c249c2..4f9b19c45afd6b26833ba892a90d3a9559d5d859 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-@@ -11,7 +11,7 @@ import java.util.Set;
- import java.util.function.Predicate;
- import java.util.function.Supplier;
- import java.util.stream.Stream;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- import org.slf4j.Logger;
- 
- public class GoalSelector {
-@@ -29,7 +29,7 @@ public class GoalSelector {
-     };
-     private final Map<Goal.Flag, WrappedGoal> lockedFlags = new EnumMap<>(Goal.Flag.class);
-     private final Set<WrappedGoal> availableGoals = Sets.newLinkedHashSet();
--    private final Supplier<ProfilerFiller> profiler;
-+    //private final Supplier<ProfilerFiller> profiler; // Plazma - Completely remove profiler
-     private final EnumSet<Goal.Flag> disabledFlags = EnumSet.noneOf(Goal.Flag.class); // Paper unused, but dummy to prevent plugins from crashing as hard. Theyll need to support paper in a special case if this is super important, but really doesn't seem like it would be.
-     private final com.destroystokyo.paper.util.set.OptimizedSmallEnumSet<net.minecraft.world.entity.ai.goal.Goal.Flag> goalTypes = new com.destroystokyo.paper.util.set.OptimizedSmallEnumSet<>(Goal.Flag.class); // Paper - remove streams from pathfindergoalselector
-     private int tickCount;
-@@ -37,9 +37,11 @@ public class GoalSelector {
-     private int curRate;
-     private static final Goal.Flag[] GOAL_FLAG_VALUES = Goal.Flag.values(); // Paper - remove streams from pathfindergoalselector
- 
-+    /* // Plazma - Completely remove profiler
-     public GoalSelector(Supplier<ProfilerFiller> profiler) {
-         this.profiler = profiler;
-     }
-+     */ // Plazma - Completely remove profiler
- 
-     public void addGoal(int priority, Goal goal) {
-         this.availableGoals.add(new WrappedGoal(priority, goal));
-diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-index 666fc85bc2079cb367b340f2605f29fe002f4d22..36c60716c6aaa446ff7123a3babafb2edd2266ac 100644
---- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-+++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-@@ -31,7 +31,7 @@ import net.minecraft.resources.ResourceLocation;
- import net.minecraft.server.packs.resources.ResourceManager;
- import net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener;
- import net.minecraft.util.GsonHelper;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- import net.minecraft.world.Container;
- import net.minecraft.world.item.ItemStack;
- import net.minecraft.world.level.Level;
-@@ -51,7 +51,7 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
-         super(RecipeManager.GSON, "recipes");
-     }
- 
--    protected void apply(Map<ResourceLocation, JsonElement> prepared, ResourceManager manager, ProfilerFiller profiler) {
-+    protected void apply(Map<ResourceLocation, JsonElement> prepared, ResourceManager manager/*, ProfilerFiller profiler*/) { // Plazma - Completely remove Profiler
-         this.hasErrors = false;
-         // CraftBukkit start - SPIGOT-5667 make sure all types are populated and mutable
-         Map<RecipeType<?>, Object2ObjectLinkedOpenHashMap<ResourceLocation, RecipeHolder<?>>> map1 = Maps.newHashMap();
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index e45a5282dc0ea3a35da24c7c3a0c7cda9a773f0c..1a5880ae3c3b17d49f0b083dff66e5619c08ec20 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -39,7 +39,7 @@ import net.minecraft.sounds.SoundSource;
- import net.minecraft.util.AbortableIterationConsumer;
- import net.minecraft.util.Mth;
- import net.minecraft.util.RandomSource;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- import net.minecraft.world.DifficultyInstance;
- import net.minecraft.world.damagesource.DamageSource;
- import net.minecraft.world.damagesource.DamageSources;
-@@ -137,7 +137,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     private final ResourceKey<DimensionType> dimensionTypeId;
-     private final Holder<DimensionType> dimensionTypeRegistration;
-     public final WritableLevelData levelData;
--    private final Supplier<ProfilerFiller> profiler;
-+    //private final Supplier<ProfilerFiller> profiler; // Plazma - Completely remove profiler
-     public final boolean isClientSide;
-     private final WorldBorder worldBorder;
-     private final BiomeManager biomeManager;
-@@ -259,7 +259,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
- 
-     public abstract ResourceKey<LevelStem> getTypeKey();
- 
--    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.LevelConfigurations> plazmaLevelConfigurationCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor // 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.function.Function<org.spigotmc.SpigotWorldConfig, org.plazmamc.plazma.configurations.LevelConfigurations> plazmaLevelConfigurationCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor // Plazma // Plazma - Completely remove profiler
-         this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
-         this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper
-         this.plazmaLevelConfiguration = plazmaLevelConfigurationCreator.apply(this.spigotConfig); // Plazma
-@@ -276,7 +276,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         }
- 
-         // CraftBukkit end
--        this.profiler = supplier;
-+        //this.profiler = supplier; // Plazma - Completely remove profiler
-         this.levelData = worlddatamutable;
-         this.dimensionTypeRegistration = holder;
-         this.dimensionTypeId = (ResourceKey) holder.unwrapKey().orElseThrow(() -> {
-@@ -1830,6 +1830,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         return false;
-     }
- 
-+    /* // Plazma - Completely remove profiler
-     public ProfilerFiller getProfiler() {
-         if (true || gg.pufferfish.pufferfish.PufferfishConfig.disableMethodProfiler) return net.minecraft.util.profiling.InactiveProfiler.INSTANCE; // Pufferfish // Purpur
-         return (ProfilerFiller) this.profiler.get();
-@@ -1838,6 +1839,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     public Supplier<ProfilerFiller> getProfilerSupplier() {
-         return this.profiler;
-     }
-+     */ // Plazma - Completely remove profiler
- 
-     @Override
-     public BiomeManager getBiomeManager() {
-diff --git a/src/main/java/net/minecraft/world/level/PathNavigationRegion.java b/src/main/java/net/minecraft/world/level/PathNavigationRegion.java
-index 0f1025495237aebe30132ace0832aa5718d6f9bb..0226280bbdb9d63831d93f980ee117da1eac08aa 100644
---- a/src/main/java/net/minecraft/world/level/PathNavigationRegion.java
-+++ b/src/main/java/net/minecraft/world/level/PathNavigationRegion.java
-@@ -8,7 +8,7 @@ import net.minecraft.core.BlockPos;
- import net.minecraft.core.Holder;
- import net.minecraft.core.SectionPos;
- import net.minecraft.core.registries.Registries;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- import net.minecraft.server.level.ServerLevel;
- import net.minecraft.world.entity.Entity;
- import net.minecraft.world.level.biome.Biome;
-@@ -155,7 +155,9 @@ public class PathNavigationRegion implements BlockGetter, CollisionGetter {
-         return this.level.getHeight();
-     }
- 
-+    /* // Plazma - Completely remove profiler
-     public ProfilerFiller getProfiler() {
-         return this.level.getProfiler();
-     }
-+     */ // Plazma - Completely remove profiler
- }
-diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 8d385708df97d47881929d4352f1b90286aad1a2..a25b93f98b2c525b146c979df2a95a9a749300a8 100644
---- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -25,7 +25,7 @@ import net.minecraft.network.FriendlyByteBuf;
- import net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData;
- import net.minecraft.server.level.FullChunkStatus;
- import net.minecraft.server.level.ServerLevel;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- import net.minecraft.world.entity.Entity;
- import net.minecraft.world.level.ChunkPos;
- import net.minecraft.world.level.Level;
-@@ -445,7 +445,7 @@ public class LevelChunk extends ChunkAccess {
-                 }
- 
-                 if (LightEngine.hasDifferentLightProperties(this, blockposition, iblockdata1, iblockdata)) {
--                    ProfilerFiller gameprofilerfiller = this.level.getProfiler();
-+                    //ProfilerFiller gameprofilerfiller = this.level.getProfiler(); // Plazma - Completely remove profiler
- 
-                     //gameprofilerfiller.push("updateSkyLightSources"); // Purpur
-                     this.skyLightSources.update(this, j, i, l);
-diff --git a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
-index a8af51a25b0f99c3a64d9150fdfcd6b818aa7581..b9689131a7a46b46c0b75b86f2bb163d7de74921 100644
---- a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
-+++ b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
-@@ -12,7 +12,7 @@ import java.util.function.Function;
- import java.util.stream.Collectors;
- import javax.annotation.Nullable;
- import net.minecraft.core.BlockPos;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- import net.minecraft.util.profiling.metrics.MetricCategory;
- import net.minecraft.world.entity.Mob;
- import net.minecraft.world.level.PathNavigationRegion;
-@@ -44,7 +44,7 @@ public class PathFinder {
-                 map.add(new java.util.AbstractMap.SimpleEntry<>(this.nodeEvaluator.getGoal(pos.getX(), pos.getY(), pos.getZ()), pos));
-             }
-             // Paper end
--            Path path = this.findPath(world.getProfiler(), node, map, followRange, distance, rangeMultiplier);
-+            Path path = this.findPath(/*world.getProfiler(), */node, map, followRange, distance, rangeMultiplier); // Plazma - Completely remove profiler
-             this.nodeEvaluator.done();
-             return path;
-         }
-@@ -52,7 +52,7 @@ public class PathFinder {
- 
-     @Nullable
-     // Paper start - optimize collection
--    private Path findPath(ProfilerFiller profiler, Node startNode, List<Map.Entry<Target, BlockPos>> positions, float followRange, int distance, float rangeMultiplier) {
-+    private Path findPath(/*ProfilerFiller profiler, */Node startNode, List<Map.Entry<Target, BlockPos>> positions, float followRange, int distance, float rangeMultiplier) { // Plazma - Completely remove profiler
-         //profiler.push("find_path"); // Purpur
-         //profiler.markForCharting(MetricCategory.PATH_FINDING); // Purpur
-         // Set<Target> set = positions.keySet();
-diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootDataManager.java b/src/main/java/net/minecraft/world/level/storage/loot/LootDataManager.java
-index dd375fffa727db76fa989248b9b836960974c372..45161f960a29395538c67461ebf864e595f6737f 100644
---- a/src/main/java/net/minecraft/world/level/storage/loot/LootDataManager.java
-+++ b/src/main/java/net/minecraft/world/level/storage/loot/LootDataManager.java
-@@ -19,7 +19,7 @@ import net.minecraft.resources.ResourceLocation;
- import net.minecraft.server.packs.resources.PreparableReloadListener;
- import net.minecraft.server.packs.resources.ResourceManager;
- import net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
- import org.slf4j.Logger;
- 
-@@ -35,7 +35,7 @@ public class LootDataManager implements PreparableReloadListener, LootDataResolv
-     public LootDataManager() {}
- 
-     @Override
--    public final CompletableFuture<Void> reload(PreparableReloadListener.PreparationBarrier synchronizer, ResourceManager manager, ProfilerFiller prepareProfiler, ProfilerFiller applyProfiler, Executor prepareExecutor, Executor applyExecutor) {
-+    public final CompletableFuture<Void> reload(PreparableReloadListener.PreparationBarrier synchronizer, ResourceManager manager/*, ProfilerFiller prepareProfiler, ProfilerFiller applyProfiler*/, Executor prepareExecutor, Executor applyExecutor) { // Plazma - Completely remove profiler
-         Map<LootDataType<?>, Map<ResourceLocation, ?>> map = new HashMap();
-         CompletableFuture<?>[] acompletablefuture = (CompletableFuture[]) LootDataType.values().map((lootdatatype) -> {
-             return LootDataManager.scheduleElementParse(lootdatatype, manager, prepareExecutor, map);
-diff --git a/src/main/java/net/minecraft/world/ticks/LevelTicks.java b/src/main/java/net/minecraft/world/ticks/LevelTicks.java
-index 0043c0087896a6df6910b0500da37d84b287c901..17a5928afade7e477cda34365dc8c72c52a6b758 100644
---- a/src/main/java/net/minecraft/world/ticks/LevelTicks.java
-+++ b/src/main/java/net/minecraft/world/ticks/LevelTicks.java
-@@ -23,7 +23,7 @@ import net.minecraft.Util;
- import net.minecraft.core.BlockPos;
- import net.minecraft.core.SectionPos;
- import net.minecraft.core.Vec3i;
--import net.minecraft.util.profiling.ProfilerFiller;
-+//import net.minecraft.util.profiling.ProfilerFiller; // Plazma - Completely remove profiler
- import net.minecraft.world.level.ChunkPos;
- import net.minecraft.world.level.levelgen.structure.BoundingBox;
- 
-@@ -32,7 +32,7 @@ public class LevelTicks<T> implements LevelTickAccess<T> {
-         return ScheduledTick.INTRA_TICK_DRAIN_ORDER.compare(a.peek(), b.peek());
-     };
-     private final LongPredicate tickCheck;
--    private final Supplier<ProfilerFiller> profiler;
-+    //private final Supplier<ProfilerFiller> profiler; // Plazma - Completely remove profiler
-     private final Long2ObjectMap<LevelChunkTicks<T>> allContainers = new Long2ObjectOpenHashMap<>();
-     private final Long2LongMap nextTickForContainer = Util.make(new Long2LongOpenHashMap(), (map) -> {
-         map.defaultReturnValue(Long.MAX_VALUE);
-@@ -48,9 +48,9 @@ public class LevelTicks<T> implements LevelTickAccess<T> {
- 
-     };
- 
--    public LevelTicks(LongPredicate tickingFutureReadyPredicate, Supplier<ProfilerFiller> profilerGetter) {
-+    public LevelTicks(LongPredicate tickingFutureReadyPredicate/*, Supplier<ProfilerFiller> profilerGetter*/) { // Plazma - Completely remove profiler
-         this.tickCheck = tickingFutureReadyPredicate;
--        this.profiler = profilerGetter;
-+        //this.profiler = profilerGetter; // Plazma - Completely remove profiler
-     }
- 
-     public void addContainer(ChunkPos pos, LevelChunkTicks<T> scheduler) {
-@@ -88,7 +88,7 @@ public class LevelTicks<T> implements LevelTickAccess<T> {
-     public void tick(long time, int maxTicks, BiConsumer<BlockPos, T> ticker) {
-         //ProfilerFiller profilerFiller = this.profiler.get(); // Purpur
-         //profilerFiller.push("collect"); // Purpur
--        this.collectTicks(time, maxTicks, null); // Purpur
-+        this.collectTicks(time, maxTicks); // Purpur // Plazma - Completely remove profiler
-         //profilerFiller.popPush("run"); // Purpur
-         //profilerFiller.incrementCounter("ticksToRun", this.toRunThisTick.size()); // Purpur
-         this.runCollectedTicks(ticker);
-@@ -97,7 +97,7 @@ public class LevelTicks<T> implements LevelTickAccess<T> {
-         //profilerFiller.pop(); // Purpur
-     }
- 
--    private void collectTicks(long time, int maxTicks, ProfilerFiller profiler) {
-+    private void collectTicks(long time, int maxTicks/*, ProfilerFiller profiler*/) { // Plazma - Completely remove profiler
-         this.sortContainersToTick(time);
-         //profiler.incrementCounter("containersToTick", this.containersToTick.size()); // Purpur
-         this.drainContainers(time, maxTicks);

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

@@ -3,18 +3,21 @@ From: AlphaKR93 <dev@alpha93.kr>
 Date: Wed, 27 Sep 2023 16:42:17 +0900
 Subject: [PATCH] Optimize default configurations
 
-Reference: YouHaveTrouble/minecraft-optimization, AkiraDevelopment/SimplyMC
+[REFERENCE]
+- YouHaveTrouble/minecraft-optimization
+- AkiraDevelopment/SimplyMC
+- 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 5f223856b06e901b100fcca8e6dd968e0b2e3a8e..13df89e7cc219cdb80c4114d05148c685ad2ecee 100644
+index 3fea9b69f4cfc94e7f01d4e3ca4ce7506a8e5d5c..5a88d2e4c7a533e420cef33830a0cc6484bfd979 100644
 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-@@ -72,7 +72,7 @@ public class PufferfishConfig {
+@@ -64,7 +64,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 - no advertisement
++				//"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");
  		
@@ -23,7 +26,7 @@ index 5f223856b06e901b100fcca8e6dd968e0b2e3a8e..13df89e7cc219cdb80c4114d05148c68
      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.doOptimize() ? 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", 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
          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");
@@ -32,7 +35,7 @@ index 5f223856b06e901b100fcca8e6dd968e0b2e3a8e..13df89e7cc219cdb80c4114d05148c68
  
      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.doOptimize()); // Purpur // Plazma - Optimize default configurations
++        dearEnabled = getBoolean("dab.enabled", "activation-range.enabled", org.plazmamc.plazma.configurations.PlazmaConfigurations.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.");
@@ -41,111 +44,225 @@ index 5f223856b06e901b100fcca8e6dd968e0b2e3a8e..13df89e7cc219cdb80c4114d05148c68
                  "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", org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 7 : 8, // Plazma - Optimize default configurations
++        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 c69892a5f31895b85e530beadd8864ac32470ba7..5f652268dadaca96a98203ad12d7a0ba0b19563b 100644
+index a6f58b3457b7477015c5c6d969e7d83017dd3fa1..85e56d726eb7780811e0a990e1ef7d3ec767e36d 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -154,7 +154,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -155,7 +155,7 @@ public class GlobalConfiguration extends ConfigurationPart {
  
      public class Watchdog extends ConfigurationPart {
          public int earlyWarningEvery = 5000;
 -        public int earlyWarningDelay = 10000;
-+        public int earlyWarningDelay = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 180000 : 10000; // Plazma - Optimize default configurations
++        public int earlyWarningDelay = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 180000 : 10000; // Plazma - Optimize default configurations
      }
  
      public SpamLimiter spamLimiter;
+@@ -193,7 +193,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+     public Commands commands;
+ 
+     public class Commands extends ConfigurationPart {
+-        public boolean suggestPlayerNamesWhenNullTabCompletions = true;
++        public boolean suggestPlayerNamesWhenNullTabCompletions = !org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize(); // Plazma - Optimize default configurations
+         public boolean fixTargetSelectorTagCompletion = true;
+         public boolean timeCommandAffectsAllWorlds = false;
+     }
+@@ -242,7 +242,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 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 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 {
+     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);
+-        public Map<Class<? extends Packet<?>>, PacketLimit> overrides = Map.of(ServerboundPlaceRecipePacket.class, new PacketLimit(4.0, 5.0, PacketLimit.ViolateAction.DROP));
++        // Plazma start - Optimize default configurations
++        public Map<Class<? extends Packet<?>>, PacketLimit> overrides = new java.util.HashMap<>() {{
++            put(ServerboundPlaceRecipePacket.class, new PacketLimit(4.0, 5.0, PacketLimit.ViolateAction.DROP));
++            if (org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize()) {
++                put(net.minecraft.network.protocol.game.ServerboundCommandSuggestionPacket.class, new PacketLimit(1.0, 15.0, PacketLimit.ViolateAction.DROP));
++                put(net.minecraft.network.protocol.game.ServerboundPlaceRecipePacket.class, new PacketLimit(4.0, 5.0, PacketLimit.ViolateAction.DROP));
++            }
++        }};
++        // Plazma end
+ 
+         @ConfigSerializable
+         public record PacketLimit(@Required double interval, @Required double maxPacketRate, ViolateAction action) {
+@@ -321,7 +329,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+                 executor.setMaximumPoolSize(_chatExecutorMaxSize);
+             }
+         }
+-        public int maxJoinsPerTick = 5;
++        public int maxJoinsPerTick = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 3 : 5; // Plazma - Optimize default configurations
+         public boolean fixEntityPositionDesync = true;
+         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 ec5e23136423e42e4f55e6ea646b8285c1ca14e2..a1d22ad65fc751fa93384f59853434ab65836133 100644
+index 385ca2c1022e0985550a5cc2bbff953f1aa33f5c..121ee93d65bcaa26bdc3e57750107cdb54f8d6d7 100644
 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-@@ -88,15 +88,27 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -96,12 +96,32 @@ public class WorldConfiguration extends ConfigurationPart {
  
          public class AntiXray extends ConfigurationPart {
              public boolean enabled = false;
 -            public EngineMode engineMode = EngineMode.HIDE;
-+            public EngineMode engineMode = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? EngineMode.OBFUSCATE_LAYER : EngineMode.HIDE; // Plazma - Optimize default configurations
++            public EngineMode engineMode = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? EngineMode.OBFUSCATE_LAYER : EngineMode.HIDE; // Plazma - Optimize default configurations
              public int maxBlockHeight = 64;
              public int updateRadius = 2;
-             public boolean lavaObscures = false;
+-            public boolean lavaObscures = false;
++            public boolean lavaObscures = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize(); // Plazma - Optimize default configurations
              public boolean usePermission = false;
--            public List<String> hiddenBlocks = List.of("copper_ore", "deepslate_copper_ore", "gold_ore", "deepslate_gold_ore", "iron_ore", "deepslate_iron_ore",
--                "coal_ore", "deepslate_coal_ore", "lapis_ore", "deepslate_lapis_ore", "mossy_cobblestone", "obsidian", "chest", "diamond_ore", "deepslate_diamond_ore",
--                "redstone_ore", "deepslate_redstone_ore", "clay", "emerald_ore", "deepslate_emerald_ore", "ender_chest"); // TODO update type to List<Block>
--            public List<String> replacementBlocks = List.of("stone", "oak_planks", "deepslate"); // TODO update type to List<Block>
+-            public List<Block> hiddenBlocks = List.of(
 +            // Plazma start - Optimize default configurations
-+            public List<String> hiddenBlocks = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ?
-+                    List.of("air", "copper_ore", "deepslate_copper_ore", "raw_copper_block", "iron_ore",
-+                            "deepslate_iron_ore", "raw_iron_block", "gold_ore", "deepslate_gold_ore", "raw_gold_block",
-+                            "lapis_ore", "deepslate_lapis_ore", "redstone_ore", "deepslate_redstone_ore", "diamond_ore",
-+                            "deepslate_diamond_ore") :
-+                    List.of("copper_ore", "deepslate_copper_ore","gold_ore", "deepslate_gold_ore",
-+                            "iron_ore", "deepslate_iron_ore", "coal_ore", "deepslate_coal_ore", "lapis_ore",
-+                            "deepslate_lapis_ore", "mossy_cobblestone", "obsidian", "chest", "diamond_ore",
-+                            "deepslate_diamond_ore", "redstone_ore", "deepslate_redstone_ore", "clay", "emerald_ore",
-+                            "deepslate_emerald_ore", "ender_chest");; // TODO update type to List<Block>
-+            public List<String> replacementBlocks = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ?
-+                    List.of("chest", "amethyst_block", "andesite", "budding_amethyst", "calcite", "coal_ore",
-+                            "deepslate_coal_ore", "deepslate", "diorite", "dirt", "emerald_ore", "granite", "gravel",
-+                            "oak_planks", "smooth_basalt", "stone", "tuff") : List.of("stone", "oak_planks", "deepslate"); // TODO update type to List<Block>
++            public List<Block> hiddenBlocks = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? List.of(
++                    //<editor-fold desc="Anti-Xray Hidden Blocks" defaultstate="collapsed">
++                    Blocks.AIR,
++                    Blocks.COPPER_ORE,
++                    Blocks.DEEPSLATE_COPPER_ORE,
++                    Blocks.RAW_COPPER_BLOCK,
++                    Blocks.IRON_ORE,
++                    Blocks.DEEPSLATE_IRON_ORE,
++                    Blocks.RAW_IRON_BLOCK,
++                    Blocks.GOLD_ORE,
++                    Blocks.DEEPSLATE_GOLD_ORE,
++                    Blocks.RAW_GOLD_BLOCK,
++                    Blocks.REDSTONE_ORE,
++                    Blocks.DEEPSLATE_REDSTONE_ORE,
++                    Blocks.LAPIS_ORE,
++                    Blocks.DEEPSLATE_LAPIS_ORE,
++                    Blocks.DIAMOND_ORE,
++                    Blocks.DEEPSLATE_DIAMOND_ORE
++                    //</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 {
+                 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">
++                    Blocks.CHEST,
++                    Blocks.AMETHYST_BLOCK,
++                    Blocks.ANDESITE,
++                    Blocks.BUDDING_AMETHYST,
++                    Blocks.CALCITE,
++                    Blocks.COAL_ORE,
++                    Blocks.DEEPSLATE_COAL_ORE,
++                    Blocks.DEEPSLATE,
++                    Blocks.DIORITE,
++                    Blocks.DIRT,
++                    Blocks.EMERALD_ORE,
++                    Blocks.GRANITE,
++                    Blocks.GRAVEL,
++                    Blocks.OAK_PLANKS,
++                    Blocks.SMOOTH_BASALT,
++                    Blocks.STONE,
++                    Blocks.TUFF
++                    //</editor-fold>
++            ) : List.of(Blocks.STONE, Blocks.OAK_PLANKS, Blocks.DEEPSLATE);
 +            // Plazma end
          }
      }
  
-@@ -150,7 +162,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -152,14 +193,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 tick = !org.plazmamc.plazma.Options.aggressiveOptimize; // Plazma - Optimize default configurations
+         }
+ 
+         public Markers markers;
+ 
+         public class Markers extends ConfigurationPart {
+-            public boolean tick = true;
++            public boolean tick = !org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize(); // Plazma - Optimize default configurations
+         }
+ 
+         public Sniffer sniffer;
+@@ -182,7 +223,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.doOptimize() ? (net.minecraft.server.MinecraftServer.getServer().server.getSimulationDistance() * 16) + 8 : category.getDespawnDistance()))); // Plazma - Optimize default configurations
++            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) {
-@@ -375,7 +387,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -381,7 +422,7 @@ public class WorldConfiguration extends ConfigurationPart {
      public class Environment extends ConfigurationPart {
          public boolean disableThunder = false;
          public boolean disableIceAndSnow = false;
 -        public boolean optimizeExplosions = false;
-+        public boolean optimizeExplosions = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize(); // Plazma - Optimize default configurations
++        public boolean optimizeExplosions = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize(); // Plazma - Optimize default configurations
          public boolean disableExplosionKnockback = false;
          public boolean generateFlatBedrock = false;
          public FrostedIce frostedIce;
-@@ -427,7 +439,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -433,7 +474,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.doOptimize(); // Plazma - Optimize default configurations
++        public boolean fixItemsMergingThroughWalls = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize(); // Plazma - Optimize default configurations
          public boolean disableUnloadedChunkEnderpearlExploit = true;
          public boolean preventTntFromMovingInWater = false;
          public boolean splitOverstackedLoot = true;
-@@ -455,9 +467,9 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -460,9 +501,9 @@ public class WorldConfiguration extends ConfigurationPart {
      public class Collisions extends ConfigurationPart {
          public boolean onlyPlayersCollide = false;
          public boolean allowVehicleCollisions = true;
 -        public boolean fixClimbingBypassingCrammingRule = false;
-+        public boolean fixClimbingBypassingCrammingRule = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize(); // Plazma - Optimize default configurations
++        public boolean fixClimbingBypassingCrammingRule = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize(); // Plazma - Optimize default configurations
          @RequiresSpigotInitialization(MaxEntityCollisionsInitializer.class)
 -        public int maxEntityCollisions = 8;
-+        public int maxEntityCollisions = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 2 : 8; // Plazma - Optimize default configurations
++        public int maxEntityCollisions = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 2 : 8; // Plazma - Optimize default configurations
          public boolean allowPlayerCrammingDamage = false;
      }
  
-@@ -465,18 +477,40 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -470,18 +511,41 @@ public class WorldConfiguration extends ConfigurationPart {
  
      public class Chunks extends ConfigurationPart {
          public AutosavePeriod autoSaveInterval = AutosavePeriod.def();
 -        public int maxAutoSaveChunksPerTick = 24;
-+        public int maxAutoSaveChunksPerTick = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 8 : 24; // Plazma - Optimize default configurations
++        public int maxAutoSaveChunksPerTick = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 8 : 24; // Plazma - Optimize default configurations
          public int fixedChunkInhabitedTime = -1;
 -        public boolean preventMovingIntoUnloadedChunks = false;
-+        public boolean preventMovingIntoUnloadedChunks = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize(); // Plazma - Optimize default configurations
++        public boolean preventMovingIntoUnloadedChunks = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize(); // Plazma - Optimize default configurations
          public Duration delayChunkUnloadsBy = Duration.of("10s");
          public Reference2IntMap<EntityType<?>> entityPerChunkSaveLimit = Util.make(new Reference2IntOpenHashMap<>(BuiltInRegistries.ENTITY_TYPE.size()), map -> {
--            map.defaultReturnValue(-1);
+             map.defaultReturnValue(-1);
 -            map.put(EntityType.EXPERIENCE_ORB, -1);
 -            map.put(EntityType.SNOWBALL, -1);
 -            map.put(EntityType.ENDER_PEARL, -1);
@@ -153,7 +270,7 @@ index ec5e23136423e42e4f55e6ea646b8285c1ca14e2..a1d22ad65fc751fa93384f59853434ab
 -            map.put(EntityType.FIREBALL, -1);
 -            map.put(EntityType.SMALL_FIREBALL, -1);
 +            // Plazma start - Optimize default configurations
-+            if (org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize()) {
++            if (org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize()) {
 +                map.put(EntityType.AREA_EFFECT_CLOUD, 8);
 +                map.put(EntityType.ARROW, 16);
 +                map.put(EntityType.DRAGON_FIREBALL, 3);
@@ -184,126 +301,113 @@ index ec5e23136423e42e4f55e6ea646b8285c1ca14e2..a1d22ad65fc751fa93384f59853434ab
          });
          public boolean flushRegionsOnSave = false;
      }
-@@ -491,9 +525,9 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -496,9 +560,9 @@ public class WorldConfiguration extends ConfigurationPart {
      public TickRates tickRates;
  
      public class TickRates extends ConfigurationPart {
 -        public int grassSpread = 1;
-+        public int grassSpread = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 4 : 1; // Plazma - Optimize default configurations
++        public int grassSpread = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 4 : 1; // Plazma - Optimize default configurations
          public int containerUpdate = 1;
 -        public int mobSpawner = 1;
-+        public int mobSpawner = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 2 : 1; // Plazma - Optimize default configurations
++        public int mobSpawner = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 2 : 1; // Plazma - Optimize default configurations
+         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));
-         public Table<EntityType<?>, String, Integer> behavior = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "validatenearbypoi", -1));
-     }
-@@ -517,9 +551,9 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -532,9 +596,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.configurations.PlazmaConfigurations.doOptimize(); // Plazma - Optimize default configurations
++        public boolean updatePathfindingOnBlockUpdate = !org.plazmamc.plazma.Options.aggressiveOptimize; // Plazma - Optimize default configurations
          public boolean showSignClickCommandFailureMsgsToPlayer = false;
 -        public RedstoneImplementation redstoneImplementation = RedstoneImplementation.VANILLA;
-+        public RedstoneImplementation redstoneImplementation = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? RedstoneImplementation.ALTERNATE_CURRENT : RedstoneImplementation.VANILLA; // Plazma - Optimize default configurations
++        public RedstoneImplementation redstoneImplementation = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? RedstoneImplementation.ALTERNATE_CURRENT : RedstoneImplementation.VANILLA; // Plazma - Optimize default configurations
          public boolean disableEndCredits = false;
          public float maxLeashDistance = 10f;
          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..ba7cf430cdff947a74ae067fc79020ae01e7e457 100644
+index 24763d3d270c29c95e0b3e85111145234f660a62..80ddc627e02e3c749e6b074afa93d357d9c7d62a 100644
 --- a/src/main/java/io/papermc/paper/configuration/type/fallback/ArrowDespawnRate.java
 +++ b/src/main/java/io/papermc/paper/configuration/type/fallback/ArrowDespawnRate.java
 @@ -29,6 +29,7 @@ public class ArrowDespawnRate extends FallbackValue.Int {
  
      @Override
      protected int fallback() {
-+        if (org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize()) return 100; // Plazma - Optimize default configurations
++        if (org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize()) return 100; // Plazma - Optimize default configurations
          return this.get(FallbackValue.SPIGOT_WORLD_CONFIG).arrowDespawnRate;
      }
  
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 30fc258faa6f087cf3c91411b48116a3ac416031..a32a1787cbcacb0d3ed6f0d751a04e8fa9d11dd6 100644
+index 60382055ccb199e32fb201fddfe34f05bf919195..d83bd5774f49af33119ea5224a2300d435898095 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -163,7 +163,7 @@ public class Main {
+@@ -164,7 +164,7 @@ public class Main {
                  File configFile = (File) optionset.valueOf("bukkit-settings");
                  YamlConfiguration configuration = YamlConfiguration.loadConfiguration(configFile);
                  configuration.options().copyDefaults(true);
 -                configuration.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(Main.class.getClassLoader().getResourceAsStream("configurations/bukkit.yml"), Charsets.UTF_8)));
-+                configuration.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(Main.class.getClassLoader().getResourceAsStream(org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? "configurations/bukkit_optimized.yml" : "configurations/bukkit.yml"), Charsets.UTF_8)));
++                configuration.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(Main.class.getClassLoader().getResourceAsStream(org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? "configurations/bukkit_optimized.yml" : "configurations/bukkit.yml"), Charsets.UTF_8))); // Plazma - Optimize default configurations
                  configuration.save(configFile);
  
                  File commandFile = (File) optionset.valueOf("commands-settings");
-@@ -177,8 +177,7 @@ public class Main {
-             }
- 
-             // Spigot Start
--            boolean eulaAgreed = Boolean.getBoolean( "com.mojang.eula.agree" );
--            eulaAgreed = eulaAgreed || Boolean.getBoolean("Paper.isRunDev");
-+            boolean eulaAgreed = Boolean.getBoolean( "com.mojang.eula.agree" ) || Boolean.getBoolean("Paper.isRunDev"); // Plazma
-             if ( eulaAgreed )
-             {
-                 System.err.println( "You have used the Spigot command line EULA agreement flag." );
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index cda4544ae96a4fcb5c6c4483df67a59f1b53fd27..54f2c5187322c6dea70c4e0e63cce2e68e7ac647 100644
+index a66dcea06424518290576c7647ae0717040586f9..41d5d15dfa2affdee68501efb2447a209c38992d 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-@@ -130,15 +130,15 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
-         this.allowNether = this.get("allow-nether", true);
+@@ -130,14 +130,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);
+         this.enableCommandBlock = this.get("enable-command-block", false);
 -        this.spawnProtection = this.get("spawn-protection", 16);
-+        this.enableCommandBlock = this.get("enable-command-block", org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize()); // Plazma - Optimize default configurations
-+        this.spawnProtection = this.get("spawn-protection", org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 0 : 16); // Plazma - Optimize default configurations
++        this.spawnProtection = this.get("spawn-protection", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 0 : 16); // Plazma - Optimize default configurations
          this.opPermissionLevel = this.get("op-permission-level", 4);
          this.functionPermissionLevel = this.get("function-permission-level", 2);
          this.maxTickTime = this.get("max-tick-time", TimeUnit.MINUTES.toMillis(1L));
-         this.maxChainedNeighborUpdates = this.get("max-chained-neighbor-updates", 1000000);
+-        this.maxChainedNeighborUpdates = this.get("max-chained-neighbor-updates", 1000000);
++        this.maxChainedNeighborUpdates = this.get("max-chained-neighbor-updates", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 10000 : 1000000); // Plazma - Optimize default configurations
          this.rateLimitPacketsPerSecond = this.get("rate-limit", 0);
 -        this.viewDistance = this.get("view-distance", 10);
 -        this.simulationDistance = this.get("simulation-distance", 10);
-+        this.viewDistance = this.get("view-distance", org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 7 : 10); // Plazma - Optimize default configurations
-+        this.simulationDistance = this.get("simulation-distance", org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 4 : 10); // Plazma - Optimize default configurations
++        this.viewDistance = this.get("view-distance", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 7 : 10); // Plazma - Optimize default configurations
++        this.simulationDistance = this.get("simulation-distance", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 4 : 10); // Plazma - Optimize default configurations
          this.maxPlayers = this.get("max-players", 20);
          this.networkCompressionThreshold = this.get("network-compression-threshold", 256);
          this.broadcastRconToOps = this.get("broadcast-rcon-to-ops", true);
-@@ -146,7 +146,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
+@@ -145,7 +145,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 behind flag
-+        this.syncChunkWrites = this.get("sync-chunk-writes", Boolean.getBoolean("Paper.enable-sync-chunk-writes")); // Paper - hide behind flag // Plazma - Optimize default configurations
+-        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.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 3e8f42811e9254567f2522e68b6018704bd63ae2..f8805e11551fddfda44aa36ba4e83f3df2f87500 100644
+index 30729e47d546b9bf18f15024516c2ebcb3b722e5..2d3f8bb3954d552d4bbcc9ec7286845a8d76da8a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -431,7 +431,7 @@ public final class CraftServer implements Server {
+@@ -426,7 +426,7 @@ public final class CraftServer implements Server {
  
          this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
          this.configuration.options().copyDefaults(true);
--        this.configuration.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(getClass().getClassLoader().getResourceAsStream("configurations/bukkit.yml"), Charsets.UTF_8)));
-+        this.configuration.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(getClass().getClassLoader().getResourceAsStream(org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? "configurations/bukkit_optimized.yml" : "configurations/bukkit.yml"), Charsets.UTF_8))); // Plazma - Optimize default configurations
+-        this.configuration.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream("configurations/bukkit.yml"), Charsets.UTF_8)));
++        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
          ConfigurationSection legacyAlias = null;
          if (!this.configuration.isString("aliases")) {
              legacyAlias = this.configuration.getConfigurationSection("aliases");
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java
-index 39db772735d57e12bbb26a6505ca7a5e360cdd78..eabd643bf096786285ee21e898b2bf8460cd5a26 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java
-@@ -302,7 +302,7 @@ public class PlazmaConfigurations extends Configurations<GlobalConfiguration, Le
-         }
-     }
+diff --git a/src/main/java/org/plazmamc/plazma/Options.java b/src/main/java/org/plazmamc/plazma/Options.java
+index a858b7ddef7f6877c0b92f4150e0dd37bea121aa..eab5ea835a524482f8cc043c7be190a835335ed2 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;
+ public interface Options {
  
--    public static boolean optimizeConfig() {
-+    public static boolean doOptimize() {
-         return OPTIMIZE_CONFIG;
-     }
+     boolean iKnowWhatIAmDoing = Boolean.getBoolean("Plazma.iKnowWhatIAmDoing");
++    boolean aggressiveOptimize = Boolean.getBoolean("Plazma.aggressiveOptimize");
  
+ }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index d0d31002562e728fa1a6c9bc81baa4534f11d365..5f0b10932f8dda09131ba68207cbfea4715e0f33 100644
+index a937993f318ef5703420f57fe65c5d990ce2c4dd..65b9e4fc073d0e97c6f90587d20e3ecbdaaf2c71 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 {
@@ -319,34 +423,43 @@ index d0d31002562e728fa1a6c9bc81baa4534f11d365..5f0b10932f8dda09131ba68207cbfea4
      }
  
 -    public static boolean useAlternateKeepAlive = false;
-+    public static boolean useAlternateKeepAlive = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize(); // Plazma - Optimize default configurations
++    public static boolean useAlternateKeepAlive = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize(); // Plazma - Optimize default configurations
      private static void useAlternateKeepAlive() {
          useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
      }
+@@ -486,7 +487,7 @@ public class PurpurConfig {
+     }
+ 
+     public static boolean useUPnP = false;
+-    public static boolean maxJoinsPerSecond = false;
++    public static boolean maxJoinsPerSecond = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize(); // Plazma - Optimize default configurations
+     public static boolean kickForOutOfOrderChat = true;
+     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 d4d9f748d259df8b6f4566efa21c15c470de5ba2..d65d3fd4572a4f5c9b3d2d4e2c0a907aae824cde 100644
+index 65ac86d07aeabb019132e180e5ed6b197e9ccad3..213559bdf83c5a07b4f7c0e32f425c2e17dc3db4 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -423,7 +423,7 @@ public class PurpurWorldConfig {
+@@ -425,7 +425,7 @@ public class PurpurWorldConfig {
      public boolean idleTimeoutTargetPlayer = true;
      public String playerDeathExpDropEquation = "expLevel * 7";
      public int playerDeathExpDropMax = 100;
 -    public boolean teleportIfOutsideBorder = false;
-+    public boolean teleportIfOutsideBorder = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize(); // Plazma - Optimize default configurations
++    public boolean teleportIfOutsideBorder = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize(); // Plazma - Optimize default configurations
      public boolean teleportOnNetherCeilingDamage = false;
      public boolean totemOfUndyingWorksInInventory = false;
      public boolean playerFixStuckPortal = false;
-@@ -3066,7 +3066,7 @@ public class PurpurWorldConfig {
+@@ -3133,7 +3133,7 @@ public class PurpurWorldConfig {
      public boolean zombieJockeyOnlyBaby = true;
      public double zombieJockeyChance = 0.05D;
      public boolean zombieJockeyTryExistingChickens = true;
 -    public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
-+    public boolean zombieAggressiveTowardsVillagerWhenLagging = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize(); // Plazma - Optimize default configurations
++    public boolean zombieAggressiveTowardsVillagerWhenLagging = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize(); // Plazma - Optimize default configurations
      public boolean zombieBypassMobGriefing = false;
      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 5b5109e942b18418b3a3a0e2109fe4ef15045fe5..e24106f0d936375f200cb82339dc03f8f6f528e6 100644
+index 1cf6d4f854d89c515e48e1fb365eb95ff9340765..7d1ae99e83dc6511838092c3ab6e0fd5f39faabc 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -150,14 +150,14 @@ public class SpigotWorldConfig
@@ -354,7 +467,7 @@ index 5b5109e942b18418b3a3a0e2109fe4ef15045fe5..e24106f0d936375f200cb82339dc03f8
      private void itemMerge()
      {
 -        this.itemMerge = this.getDouble("merge-radius.item", 2.5 );
-+        this.itemMerge = this.getDouble("merge-radius.item", org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 3.5 : 2.5 ); // Plazma - Optimize default configurations
++        this.itemMerge = this.getDouble("merge-radius.item", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 3.5 : 2.5 ); // Plazma - Optimize default configurations
          this.log( "Item Merge Radius: " + this.itemMerge );
      }
  
@@ -362,7 +475,7 @@ index 5b5109e942b18418b3a3a0e2109fe4ef15045fe5..e24106f0d936375f200cb82339dc03f8
      private void expMerge()
      {
 -        this.expMerge = this.getDouble("merge-radius.exp", 3.0 );
-+        this.expMerge = this.getDouble("merge-radius.exp", org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 4.0 : 3.0 ); // Plazma - Optimize default configurations
++        this.expMerge = this.getDouble("merge-radius.exp", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 4.0 : 3.0 ); // Plazma - Optimize default configurations
          this.log( "Experience Merge Radius: " + this.expMerge );
      }
  
@@ -371,7 +484,7 @@ index 5b5109e942b18418b3a3a0e2109fe4ef15045fe5..e24106f0d936375f200cb82339dc03f8
      private void mobSpawnRange()
      {
 -        this.mobSpawnRange = (byte) getInt( "mob-spawn-range", 8 ); // Paper - Vanilla
-+        this.mobSpawnRange = (byte) getInt( "mob-spawn-range", org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 3 : 8 ); // Paper - Vanilla // Plazma - Optimize default configurations
++        this.mobSpawnRange = (byte) getInt( "mob-spawn-range", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 3 : 8 ); // Paper - Vanilla // Plazma - Optimize default configurations
          this.log( "Mob Spawn Range: " + this.mobSpawnRange );
      }
  
@@ -381,37 +494,37 @@ index 5b5109e942b18418b3a3a0e2109fe4ef15045fe5..e24106f0d936375f200cb82339dc03f8
  
 -    public int animalActivationRange = 32;
 -    public int monsterActivationRange = 32;
-+    public int animalActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 16 : 32; // Plazma - Optimize default configurations
-+    public int monsterActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 24 : 32; // Plazma - Optimize default configurations
++    public int animalActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 16 : 32; // Plazma - Optimize default configurations
++    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.doOptimize() ? 8 : 16; // Plazma - Optimize default configurations
++    public int miscActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 8 : 16; // Plazma - Optimize default configurations
      // Paper start
 -    public int flyingMonsterActivationRange = 32;
 -    public int waterActivationRange = 16;
 -    public int villagerActivationRange = 32;
-+    public int flyingMonsterActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 48 : 32; // Plazma - Optimize default configurations
-+    public int waterActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 8 : 16; // Plazma - Optimize default configurations
-+    public int villagerActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 16 : 32; // Plazma - Optimize default configurations
++    public int flyingMonsterActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 48 : 32; // Plazma - Optimize default configurations
++    public int waterActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 8 : 16; // Plazma - Optimize default configurations
++    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.doOptimize() ? 40 : 100; // Plazma - Optimize default configurations
-+    public int wakeUpInactiveMonsters = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 4 : 8; // Plazma - Optimize default configurations
++    public int wakeUpInactiveAnimalsFor = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 40 : 100; // Plazma - Optimize default configurations
++    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.doOptimize() ? 60 : 100; // Plazma - Optimize default configurations
-+    public int wakeUpInactiveVillagers = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 1 : 4; // Plazma - Optimize default configurations
++    public int wakeUpInactiveMonstersFor = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 60 : 100; // Plazma - Optimize default configurations
++    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.doOptimize() ? 20 : 100; // Plazma - Optimize default configurations
-+    public int wakeUpInactiveFlying = org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 1 : 8; // Plazma - Optimize default configurations
++    public int wakeUpInactiveVillagersFor = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 20 : 100; // Plazma - Optimize default configurations
++    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.doOptimize() ? 60 : 100; // Plazma - Optimize default configurations
++    public int wakeUpInactiveFlyingFor = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 60 : 100; // Plazma - Optimize default configurations
      public int villagersWorkImmunityAfter = 5*20;
      public int villagersWorkImmunityFor = 20;
      public boolean villagersActiveForPanic = true;
@@ -420,7 +533,7 @@ index 5b5109e942b18418b3a3a0e2109fe4ef15045fe5..e24106f0d936375f200cb82339dc03f8
              this.set( "ticks-per.hopper-check", 1 );
          }
 -        this.hopperCheck = this.getInt( "ticks-per.hopper-check", 1 );
-+        this.hopperCheck = this.getInt( "ticks-per.hopper-check", org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 8: 1 ); // Plazma - Optimize default configurations
++        this.hopperCheck = this.getInt( "ticks-per.hopper-check", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 8: 1 ); // Plazma - Optimize default configurations
          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 );
@@ -429,7 +542,7 @@ index 5b5109e942b18418b3a3a0e2109fe4ef15045fe5..e24106f0d936375f200cb82339dc03f8
      private void arrowDespawnRate()
      {
 -        this.arrowDespawnRate = this.getInt( "arrow-despawn-rate", 1200 );
-+        this.arrowDespawnRate = this.getInt( "arrow-despawn-rate", org.plazmamc.plazma.configurations.PlazmaConfigurations.doOptimize() ? 300 : 1200 ); // Plazma - Optimize default configurations
++        this.arrowDespawnRate = this.getInt( "arrow-despawn-rate", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 300 : 1200 ); // Plazma - Optimize default configurations
          this.tridentDespawnRate = this.getInt( "trident-despawn-rate", this.arrowDespawnRate );
          this.log( "Arrow Despawn Rate: " + this.arrowDespawnRate + " Trident Respawn Rate:" + this.tridentDespawnRate );
      }

patches/server/0014-Configurable-nether-portal-size.patch

@@ -1,70 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sat, 25 Mar 2023 00:10:52 +0900
-Subject: [PATCH] Configurable nether portal size
-
-Configurable 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 e7554ec800f321e4e34c926c53f2375a8c3aa979..c7f974e0b614afa1ced716ff7b6c67ee037a4071 100644
---- a/src/main/java/net/minecraft/world/level/portal/PortalShape.java
-+++ b/src/main/java/net/minecraft/world/level/portal/PortalShape.java
-@@ -100,7 +100,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().plazmaLevelConfiguration().structure.netherPortal.size.width.min() && i <= this.level.getMinecraftWorld().plazmaLevelConfiguration().structure.netherPortal.size.width.max() ? i : 0; // Plazma
-     }
- 
-     private int getDistanceUntilEdgeAboveFrame(BlockPos pos, Direction direction) {
-@@ -133,7 +133,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().plazmaLevelConfiguration().structure.netherPortal.size.height.min() && i <= this.level.getMinecraftWorld().plazmaLevelConfiguration().structure.netherPortal.size.height.max() && this.hasTopFrame(blockposition_mutableblockposition, i) ? i : 0; // Plazma
-     }
- 
-     private boolean hasTopFrame(BlockPos.MutableBlockPos pos, int height) {
-@@ -187,7 +187,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().plazmaLevelConfiguration().structure.netherPortal.size.width.min() && this.width <= this.level.getMinecraftWorld().plazmaLevelConfiguration().structure.netherPortal.size.width.max() && this.height >= this.level.getMinecraftWorld().plazmaLevelConfiguration().structure.netherPortal.size.height.min() && this.height <= this.level.getMinecraftWorld().plazmaLevelConfiguration().structure.netherPortal.size.height.max(); // Plazma
-     }
- 
-     // CraftBukkit start - return boolean
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index d990c031255daf0d43541efe175c5b52736a6990..36c367c577e61422e51ab08c5aaa2a88c94e1636 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-@@ -39,6 +39,27 @@ public class LevelConfigurations extends ConfigurationPart {
-         public NetherPortal netherPortal;
-         public class NetherPortal extends ConfigurationPart {
- 
-+            public Size size;
-+            public class Size extends ConfigurationPart {
-+
-+                public Width width;
-+                public class Width extends ConfigurationPart {
-+
-+                    int min; public int min() { return Math.max(this.min, 1); }
-+                    int max; public int max() { return Math.max(this.min, this.max); }
-+
-+                }
-+
-+                public Height height;
-+                public class Height extends ConfigurationPart {
-+
-+                    int min; public int min() { return Math.max(this.min, 2); }
-+                    int max; public int max() { return Math.max(this.min, this.max); }
-+
-+                }
-+
-+            }
-+
-         }
- 
-     }

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

@@ -1,24 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 27 Sep 2023 16:55:12 +0900
-Subject: [PATCH] Console logging tweaks
+Date: Sun, 5 Nov 2023 10:40:49 +0900
+Subject: [PATCH] Tweak console logging
 
 
-diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-index e4fd372a1d585887287253a02531cd192929377b..dae0b0e1288afe0d8eb70d0e8e2db152aad42bf4 100644
---- a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-+++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-@@ -355,7 +355,7 @@ public final class ChatProcessor {
- 
-         private void sendToServer(final ChatType.Bound chatType, final @Nullable Function<Audience, net.minecraft.network.chat.Component> msgFunction) {
-             final PlayerChatMessage toConsoleMessage = msgFunction == null ? ChatProcessor.this.message : ChatProcessor.this.message.withUnsignedContent(msgFunction.apply(ChatProcessor.this.server.console));
--            ChatProcessor.this.server.logChatMessage(toConsoleMessage.decoratedContent(), chatType, ChatProcessor.this.server.getPlayerList().verifyChatTrusted(toConsoleMessage) ? null : "Not Secure");
-+            ChatProcessor.this.server.logChatMessage(toConsoleMessage.decoratedContent(), chatType, (!org.plazmamc.plazma.configurations.GlobalConfiguration.get().consoleLogs.notSecurePrefix || ChatProcessor.this.server.getPlayerList().verifyChatTrusted(toConsoleMessage)) ? null : "Not Secure"); // Plazma
-         }
-     }
- 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index a970e00482952318c258fc406cb7c39a229b65bc..879c090d9c4574a2cd45a0eb1bf9cb171834d940 100644
+index b7709cbb1a78eb1daac2112cb9fbf5d379aaa662..2a73508dd8a59c6af8b65ab2db97b6e20b104c57 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
@@ -33,29 +20,16 @@ index a970e00482952318c258fc406cb7c39a229b65bc..879c090d9c4574a2cd45a0eb1bf9cb17
 -            DedicatedServer.LOGGER.warn("FOR MORE INFORMATION, SEE https://madelinemiller.dev/blog/root-minecraft-server/");
 -            DedicatedServer.LOGGER.warn("****************************");
 -        }
--        // Paper end
+-        // Paper end - detect running as root
 -
          DedicatedServer.LOGGER.info("Loading properties");
          DedicatedServerProperties dedicatedserverproperties = this.settings.getProperties();
  
-@@ -318,6 +308,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
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().consoleLogs.offlineWarnings) // Plazma - Console logging tweaks
-         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.");
-@@ -331,9 +322,21 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-                 DedicatedServer.LOGGER.warn("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose.");
-             }
-             // Spigot end
--            DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
-+            DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file or set \"console-logs.offline-warning\" to \"false\" in the config/plazma-global.yml file."); // Plazma
-         }
- 
-+        // Plazma start - Console logging tweaks
-+        // Moved down
+@@ -212,6 +202,17 @@ 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
 +        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().consoleLogs.rootUserWarnings && io.papermc.paper.util.ServerEnvironment.userIsRootOrAdmin()) {
 +            DedicatedServer.LOGGER.warn("****************************");
@@ -64,33 +38,48 @@ index a970e00482952318c258fc406cb7c39a229b65bc..879c090d9c4574a2cd45a0eb1bf9cb17
 +            DedicatedServer.LOGGER.warn("FOR MORE INFORMATION, SEE https://madelinemiller.dev/blog/root-minecraft-server/");
 +            DedicatedServer.LOGGER.warn("****************************");
 +        }
-+        // Paper end
-+        // Plazma end
++        // Paper end - detect running as root
++        // Plazma end - Tweak console logging
+         // 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
+@@ -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
++        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().consoleLogs.offlineWarnings && !(io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.onlineMode)) // Plazma - Tweak console logging
+         if (!this.usesAuthentication()) {
+             DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
+             DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
+@@ -333,7 +335,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+                 DedicatedServer.LOGGER.warn("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose.");
+             }
+             // Spigot end
+-            DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
++            DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file or set \"console-logs.offline-warnings\" to \"false\" in the config/plazma-global.yml file."); // Plazma - Tweak console logging
+         }
+ 
  
-         if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
-             return false;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5c38df8170033dbfee267520991a3cc3285d219e..58cc1bed851994fb591e9b832b98d25eda153b47 100644
+index ac1e0c66f167218306504db6037cc1d6509072a0..ef4b1fb1532e1939d9a7e5337edc80b334b78318 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1440,7 +1440,7 @@ public abstract class PlayerList {
-     }
+@@ -1468,6 +1468,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);
-+        boolean flag = !org.plazmamc.plazma.configurations.GlobalConfiguration.get().consoleLogs.notSecurePrefix || this.verifyChatTrusted(message); // Plazma
+         boolean flag = this.verifyChatTrusted(message);
++        flag = flag || org.plazmamc.plazma.configurations.GlobalConfiguration.get().consoleLogs.notSecurePrefix; // Plazma - Tweak console logging
  
          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 d506e0c2b37f91e46e682652bd134ad91db28f84..44df2c0a1ed3d006b455ba2a47d6bc9059d804e1 100644
+index 2adaa7c6433ac3f54c9d75ee3c14772b4c538418..294fdbba44191427a841f8ac82b18ed8d706f53e 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -40,4 +40,13 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public class Player extends ConfigurationPart {
+@@ -67,4 +67,13 @@ public class GlobalConfiguration extends ConfigurationPart {
  
      }
-+
+ 
 +    public ConsoleLogs consoleLogs;
 +    public class ConsoleLogs extends ConfigurationPart {
 +
@@ -99,4 +88,5 @@ index d506e0c2b37f91e46e682652bd134ad91db28f84..44df2c0a1ed3d006b455ba2a47d6bc90
 +        public boolean notSecurePrefix = true;
 +
 +    }
++
  }

patches/server/0015-Add-missing-purpur-configuration-options.patch

@@ -5,7 +5,7 @@ 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..3f36eedeae4b94ca684c57f4ec8d2d1ab5c51aae 100644
+index c783ce59ea766e6c46a3313628b961f27e01ee8b..8adcffc1e6434e06ca52d119a7326a1272897307 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
@@ -13,7 +13,7 @@ index c783ce59ea766e6c46a3313628b961f27e01ee8b..3f36eedeae4b94ca684c57f4ec8d2d1a
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
      }
 +
-+    // Plazma start
++    // Plazma start - Add missing purpur configuration options
 +    @Override
 +    public boolean isSensitiveToWater() {
 +        return level().purpurConfig.allayTakeDamageFromWater;
@@ -28,12 +28,12 @@ index c783ce59ea766e6c46a3313628b961f27e01ee8b..3f36eedeae4b94ca684c57f4ec8d2d1a
 +    public void initAttributes() {
 +        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level().purpurConfig.allayMaxHealth);
 +    }
-+    // Plazma end
++    // 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 1d84135c709a90843b1ee34fb47508e78a7ce95d..c97ef420581803b569d130b58a97f67d1fee54f2 100644
+index 41773acc8e8e27daa1fe43726939b2d95da92c30..7574da6cb1844305f965f9725c7d8cb91c92cbd7 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
@@ -41,7 +41,7 @@ index 1d84135c709a90843b1ee34fb47508e78a7ce95d..c97ef420581803b569d130b58a97f67d
          return this.level().purpurConfig.camelBreedingTicks;
      }
 +
-+    // Plazma start
++    // Plazma start - Add missing purpur configuration options
 +    @Override
 +    public boolean isSensitiveToWater() {
 +        return level().purpurConfig.camelTakeDamageFromWater;
@@ -51,12 +51,12 @@ index 1d84135c709a90843b1ee34fb47508e78a7ce95d..c97ef420581803b569d130b58a97f67d
 +    public boolean isAlwaysExperienceDropper() {
 +        return level().purpurConfig.camelAlwaysDropExp;
 +    }
-+    // Plazma end
++    // Plazma end - Add missing purpur configuration options
      // Purpur end
  
      @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 9417ce67cc231d5bfa6813f78ec27196eed423c8..4e471e4a259a64c44da5ab450f0137691428ff6a 100644
+index d6340d0a1308bafd3ba176562bf08dcadec02b34..e079f0994c81561510e5d223d2203e349daf07e1 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> {
@@ -64,7 +64,7 @@ index 9417ce67cc231d5bfa6813f78ec27196eed423c8..4e471e4a259a64c44da5ab450f013769
          return (getRider() != null && isControllable()) ? level().purpurConfig.frogRidableJumpHeight * this.getBlockJumpFactor() : super.getJumpPower();
      }
 +
-+    // Plazma start
++    // Plazma start - Add missing purpur configuration options
 +    @Override
 +    public boolean isSensitiveToWater() {
 +        return level().purpurConfig.frogTakeDamageFromWater;
@@ -79,20 +79,20 @@ index 9417ce67cc231d5bfa6813f78ec27196eed423c8..4e471e4a259a64c44da5ab450f013769
 +    public void initAttributes() {
 +        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level().purpurConfig.frogMaxHealth);
 +    }
-+    // Plazma end
++    // Plazma end - Add missing purpur configuration options
      // Purpur end
  
      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 6b012bea26e8ef0c04571f43da67f6e108188830..7c816b879d47a1b8a480f4237d1ff0e11df4c98e 100644
+index 2a9c2a69a0589e4e7b7c79d3716376b360a2eba1..630eaae555403db79f4e16880ca443904b9254ab 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
-@@ -87,6 +87,23 @@ public class Tadpole extends AbstractFish {
+@@ -90,6 +90,23 @@ public class Tadpole extends AbstractFish {
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
      }
 +
-+    // Plazma start
++    // Plazma start - Add missing purpur configuration options
 +    @Override
 +    public boolean isSensitiveToWater() {
 +        return level().purpurConfig.tadpoleTakeDamageFromWater;
@@ -107,12 +107,12 @@ index 6b012bea26e8ef0c04571f43da67f6e108188830..7c816b879d47a1b8a480f4237d1ff0e1
 +    public void initAttributes() {
 +        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level().purpurConfig.tadpoleMaxHealth);
 +    }
-+    // Plazma end
++    // Plazma end - Add missing purpur configuration options
      // Purpur end
  
      @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 dcb10e2ea1e0c7d0479adae5bc2ff57ece172aad..795c93352dfa69fad0e034a8377eceb6dc1e81da 100644
+index 5e7d76dcdc170b809ab82f6e2259c9b4d3d741be..24e351b40745d15e065f4c3cd904596c6daf4cfb 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 {
@@ -120,7 +120,7 @@ index dcb10e2ea1e0c7d0479adae5bc2ff57ece172aad..795c93352dfa69fad0e034a8377eceb6
          return level().purpurConfig.snifferControllable;
      }
 +
-+    // Plazma start
++    // Plazma start - Add missing purpur configuration options
 +    @Override
 +    public boolean isSensitiveToWater() {
 +        return level().purpurConfig.snifferTakeDamageFromWater;
@@ -130,20 +130,20 @@ index dcb10e2ea1e0c7d0479adae5bc2ff57ece172aad..795c93352dfa69fad0e034a8377eceb6
 +    public boolean isAlwaysExperienceDropper() {
 +        return level().purpurConfig.snifferAlwaysDropExp;
 +    }
-+    // Plazma end
++    // Plazma end - Add missing purpur configuration options
      // Purpur end
  
      @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 5e66c2bd3807619cadee5b7081d93d21886e2806..66d47c1613532189e761c0f48d893652c17fe240 100644
+index bf7ef72a7d92db8f11789a69583270644de0dac7..1f476a4fd148ac9a4c9ad5d12de46a16e4116239 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
-@@ -146,6 +146,23 @@ public class Warden extends Monster implements VibrationSystem {
+@@ -147,6 +147,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
      }
 +
-+    // Plazma start
++    // Plazma start - Add missing purpur configuration options
 +    @Override
 +    public boolean isSensitiveToWater() {
 +        return level().purpurConfig.wardenTakeDamageFromWater;
@@ -158,41 +158,41 @@ index 5e66c2bd3807619cadee5b7081d93d21886e2806..66d47c1613532189e761c0f48d893652
 +    public void initAttributes() {
 +        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level().purpurConfig.wardenMaxHealth);
 +    }
-+    // Plazma end
++    // Plazma end - Add missing purpur configuration options
      // 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
-index e88c39d405fc7068db64ad34a03dec8d559e749e..bb5d42ca73722f3a02154ed889625ded2ac63e6f 100644
+index 58af87b8faf4f8d6bdb111c49a429466acface68..22cc678f9bd39acc27ba2d2e7981f9e8026440d4 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
-@@ -41,7 +41,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
+@@ -43,7 +43,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
  
      public ChestBoat(EntityType<? extends Boat> type, Level world) {
          super(type, world);
 -        this.itemStacks = NonNullList.withSize(27, ItemStack.EMPTY);
-+        this.itemStacks = NonNullList.withSize(org.purpurmc.purpur.PurpurConfig.chestBoatRows * 9, ItemStack.EMPTY); // Plazma
++        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) {
-@@ -160,7 +160,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
+@@ -170,7 +170,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
  
      @Override
      public int getContainerSize() {
 -        return 27;
-+        return org.purpurmc.purpur.PurpurConfig.chestBoatRows * 9; // Plazma
++        return org.purpurmc.purpur.PurpurConfig.chestBoatRows * 9; // Plazma - Add missing purpur configuration options
      }
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 5f0b10932f8dda09131ba68207cbfea4715e0f33..92cb442d9326b4fd47cd6ec0425192f751d3e538 100644
+index 65b9e4fc073d0e97c6f90587d20e3ecbdaaf2c71..fc48ff9270e32c3b3dbf7ffd310cab7c33d459c0 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 {
      }
  
      public static int barrelRows = 3;
-+    public static int chestBoatRows = 3; // Plazma
++    public static int chestBoatRows = 3; // Plazma - Add missing purpur configuration options
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
      public static boolean cryingObsidianValidForPortalFrame = false;
@@ -200,15 +200,15 @@ index 5f0b10932f8dda09131ba68207cbfea4715e0f33..92cb442d9326b4fd47cd6ec0425192f7
              case 1 -> 9;
              default -> 27;
          });
-+        chestBoatRows = getInt("settings.blocks.chest_boat.rows", chestBoatRows); // Plazma
++        chestBoatRows = getInt("settings.blocks.chest_boat.rows", chestBoatRows); // Plazma - Add missing purpur configuration options
          enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
          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 d65d3fd4572a4f5c9b3d2d4e2c0a907aae824cde..1ea0fe11fd9e9a8f300efc85926b9724ab4f69a7 100644
+index 213559bdf83c5a07b4f7c0e32f425c2e17dc3db4..c7d8f22ecaf22232aef015da5a330dc39db4b695 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1113,7 +1113,15 @@ public class PurpurWorldConfig {
+@@ -1180,7 +1180,15 @@ public class PurpurWorldConfig {
      public boolean allayRidableInWater = true;
      public boolean allayControllable = true;
      public List<String> allayRespectNBT = new ArrayList<>();
@@ -220,11 +220,11 @@ index d65d3fd4572a4f5c9b3d2d4e2c0a907aae824cde..1ea0fe11fd9e9a8f300efc85926b9724
 +        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
++    // 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);
-@@ -1232,7 +1240,15 @@ public class PurpurWorldConfig {
+@@ -1299,7 +1307,15 @@ public class PurpurWorldConfig {
      public double camelMovementSpeedMin = 0.09D;
      public double camelMovementSpeedMax = 0.09D;
      public int camelBreedingTicks = 6000;
@@ -236,11 +236,11 @@ index d65d3fd4572a4f5c9b3d2d4e2c0a907aae824cde..1ea0fe11fd9e9a8f300efc85926b9724
 +        //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
++    // 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);
-@@ -1660,7 +1676,15 @@ public class PurpurWorldConfig {
+@@ -1727,7 +1743,15 @@ public class PurpurWorldConfig {
      public boolean frogControllable = true;
      public float frogRidableJumpHeight = 0.65F;
      public int frogBreedingTicks = 6000;
@@ -252,11 +252,11 @@ index d65d3fd4572a4f5c9b3d2d4e2c0a907aae824cde..1ea0fe11fd9e9a8f300efc85926b9724
 +        frogMaxHealth = getDouble("mobs.frog.attributes.max_health", frogMaxHealth);
 +        frogTakeDamageFromWater = getBoolean("mobs.frog.takes-damage-from-water", frogTakeDamageFromWater);
 +        frogAlwaysDropExp = getBoolean("mobs.frog.always-drop-exp", frogAlwaysDropExp);
-+    // Plazma end
++    // Plazma end - Add missing purpur configuration options
          frogRidable = getBoolean("mobs.frog.ridable", frogRidable);
          frogRidableInWater = getBoolean("mobs.frog.ridable-in-water", frogRidableInWater);
          frogControllable = getBoolean("mobs.frog.controllable", frogControllable);
-@@ -2613,7 +2637,13 @@ public class PurpurWorldConfig {
+@@ -2678,7 +2702,13 @@ public class PurpurWorldConfig {
      public boolean snifferControllable = true;
      public double snifferMaxHealth = 14.0D;
      public int snifferBreedingTicks = 6000;
@@ -266,11 +266,11 @@ index d65d3fd4572a4f5c9b3d2d4e2c0a907aae824cde..1ea0fe11fd9e9a8f300efc85926b9724
      private void snifferSettings() {
 +        snifferTakeDamageFromWater = getBoolean("mobs.sniffer.takes-damage-from-water", snifferTakeDamageFromWater);
 +        snifferAlwaysDropExp = getBoolean("mobs.sniffer.always-drop-exp", snifferAlwaysDropExp);
-+    // Plazma end
++    // Plazma end - Add missing purpur configuration options
          snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable);
          snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater);
          snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable);
-@@ -2712,7 +2742,15 @@ public class PurpurWorldConfig {
+@@ -2777,7 +2807,15 @@ public class PurpurWorldConfig {
      public boolean tadpoleRidable = false;
      public boolean tadpoleRidableInWater = true;
      public boolean tadpoleControllable = true;
@@ -282,11 +282,11 @@ index d65d3fd4572a4f5c9b3d2d4e2c0a907aae824cde..1ea0fe11fd9e9a8f300efc85926b9724
 +        tadpoleMaxHealth = getDouble("mobs.tadpole.attributes.max_health", tadpoleMaxHealth);
 +        tadpoleTakeDamageFromWater = getBoolean("mobs.tadpole.takes-damage-from-water", tadpoleTakeDamageFromWater);
 +        tadpoleAlwaysDropExp = getBoolean("mobs.tadpole.always-drop-exp", tadpoleAlwaysDropExp);
-+    // Plazma end
++    // Plazma end - Add missing purpur configuration options
          tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable);
          tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater);
          tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable);
-@@ -2922,7 +2960,15 @@ public class PurpurWorldConfig {
+@@ -2989,7 +3027,15 @@ public class PurpurWorldConfig {
      public boolean wardenRidable = false;
      public boolean wardenRidableInWater = true;
      public boolean wardenControllable = true;
@@ -298,7 +298,7 @@ index d65d3fd4572a4f5c9b3d2d4e2c0a907aae824cde..1ea0fe11fd9e9a8f300efc85926b9724
 +        wardenMaxHealth = getDouble("mobs.warden.attributes.max_health", wardenMaxHealth);
 +        wardenTakeDamageFromWater = getBoolean("mobs.warden.takes-damage-from-water", wardenTakeDamageFromWater);
 +        wardenAlwaysDropExp = getBoolean("mobs.warden.always-drop-exp", wardenAlwaysDropExp);
-+    // Plazma end
++    // Plazma end - Add missing purpur configuration options
          wardenRidable = getBoolean("mobs.warden.ridable", wardenRidable);
          wardenRidableInWater = getBoolean("mobs.warden.ridable-in-water", wardenRidableInWater);
          wardenControllable = getBoolean("mobs.warden.controllable", wardenControllable);

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

@@ -5,7 +5,7 @@ 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 c97ef420581803b569d130b58a97f67d1fee54f2..e562dffdf84612b50c5d464f9913cfe8ec5c6279 100644
+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
@@ -22,7 +22,7 @@ index c97ef420581803b569d130b58a97f67d1fee54f2..e562dffdf84612b50c5d464f9913cfe8
          //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 795c93352dfa69fad0e034a8377eceb6dc1e81da..e743b4891c1e56f82d40f798e456a701b0efbc73 100644
+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 {
@@ -38,15 +38,15 @@ index 795c93352dfa69fad0e034a8377eceb6dc1e81da..e743b4891c1e56f82d40f798e456a701
          //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 66d47c1613532189e761c0f48d893652c17fe240..8a5d8f9ad1bd94ca53c1ffd1872275c07a52f0b7 100644
+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
-@@ -319,7 +319,7 @@ public class Warden extends Monster implements VibrationSystem {
+@@ -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
++        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/0018-Add-option-to-change-nether-portal-size.patch

@@ -0,0 +1,63 @@
+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-Don-t-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: Wed, 27 Sep 2023 22:15:39 +0900
-Subject: [PATCH] Don't 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 081691f9710ff1115e4308f79ed49fbc38941193..79a27755534384ab94e79e422c0a5e9ccecacd8c 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
-@@ -70,6 +70,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
-     }
- 
-     public void unpackLootTable(@Nullable Player player) {
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.dontRefreshLootTableForNonPlayerInteraction && player == null) return; // Plazma
-         if (this.lootableData.shouldReplenish(player) && this.level.getServer() != null) { // Paper
-             LootTable lootTable = this.level.getServer().getLootData().getLootTable(this.lootTable);
-             if (player instanceof ServerPlayer) {
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 9e26e598d7c381368de422ab0c3cc7936e3bbb6d..5a62bffe495002b3bbf5fd995df135c5d174458a 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -36,6 +36,7 @@ public class GlobalConfiguration extends ConfigurationPart {
- 
-         public boolean reduceCreateRandomInstance = DO_OPTIMIZE;
-         public boolean suppressThreadSafeRandom = DO_OPTIMIZE;
-+        public boolean dontRefreshLootTableForNonPlayerInteraction = DO_OPTIMIZE;
- 
-     }
- 

patches/server/0019-Don-t-load-chunks-to-spawn-phantom.patch

@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 27 Sep 2023 22:17:11 +0900
-Subject: [PATCH] Don't 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 f74c5eda91a3d521763ec7bc33f23e0c62458cc2..e7a9683fe6bd72e9e7644770953506195567e03b 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 {
- 
-                                     if (randomsource.nextInt(j) >= world.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper
-                                         BlockPos blockposition1 = blockposition.above(20 + randomsource.nextInt(15)).east(-10 + randomsource.nextInt(21)).south(-10 + randomsource.nextInt(21));
-+                                        if (world.plazmaLevelConfiguration().entity.phantom.dontLoadChunksToSpawn && world.hasChunkAt(blockposition1)) continue; // Plazma
-                                         BlockState iblockdata = world.getBlockState(blockposition1);
-                                         FluidState fluid = world.getFluidState(blockposition1);
- 
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 146af5bb54da67c134485dc67e8d9a569889434a..0a23900b18ec46ce2a7d47160dff013c7c8a8533 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-@@ -33,6 +33,13 @@ public class LevelConfigurations extends ConfigurationPart {
-     public Entity entity;
-     public class Entity extends ConfigurationPart {
- 
-+        public Phantom phantom;
-+        public class Phantom extends ConfigurationPart {
-+
-+            public boolean dontLoadChunksToSpawn = DO_OPTIMIZE;
-+
-+        }
-+
-     }
- 
-     public Structure structure;

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

@@ -5,68 +5,67 @@ 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 44248dc470d0882b7287debd1993cedf0f238aca..ee571f465ca1e83e760a4d57b3d11accb53c6cfe 100644
+index c153becedc7c8573dc1d8a736581db2a31a8d4f5..fcc197256be00621bb3875c20849fe083a453c5c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -228,7 +228,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     private ServerStatus status;
+@@ -236,6 +236,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      @Nullable
      private ServerStatus.Favicon statusIcon;
--    private final RandomSource random;
-+    private final RandomSource random; public RandomSource getRandom() { return this.random; } // Plazma
+     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 f5bc3497831877e0c2b7dc1cbd8abe3a67d7695b..7834700eb0e1d789f7b338b535a0a9f8965201ef 100644
+index b47a8a082170bcb630c4354be7c77a4cac71d105..7fe6b99e146e7374cd29534f1e89046edd340a82 100644
 --- a/src/main/java/net/minecraft/server/commands/SpreadPlayersCommand.java
 +++ b/src/main/java/net/minecraft/server/commands/SpreadPlayersCommand.java
-@@ -65,7 +65,7 @@ public class SpreadPlayersCommand {
+@@ -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.plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? worldserver.getRandom() : RandomSource.create(); // Plazma - Reduce create random instance
++            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 99cf8ce63316e127a5ee84cdd96df80d440dc0c3..c3bb82793ecd5333d8dbef7a90729d80616ea4ce 100644
+index 36b7686fdfeaab13cb1be9610ddc76fc70f6f6e5..10b990ea1c86fcaf7fd6afb8998d144bb5463e3a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -448,7 +448,7 @@ public class ServerPlayer extends Player {
+@@ -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.plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? worldserver.getRandom() : RandomSource.create()).nextInt(i1); // Plazma - Reduce create random instance
++            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;
-@@ -485,7 +485,7 @@ public class ServerPlayer extends Player {
+@@ -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.plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? world.getRandom() : RandomSource.create()).nextInt(i1); // Plazma - Reduce create random instance
++            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 d38685f82d2e6c4e71179bf3a85a8b183aa6c44b..1265e6a521222be0c957065f5b788d68cb3d863f 100644
+index 8b62f992ec61d0a66a3856b4928ee2d705548291..01069a21857f9f3b7905861ee38c3891903af3b8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -70,7 +70,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -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.reduceCreateRandomInstance ? server.getRandom() : RandomSource.create()).nextInt()); // Plazma - Reduce create random instance
++        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..7f4c0827d2269baa032dac4798fe6c2a740ba7fa 100644
+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 {
@@ -74,38 +73,25 @@ index 1ef089dbf83de35d875c00efdf468c397be56978..7f4c0827d2269baa032dac4798fe6c2a
              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.reduceCreateRandomInstance ? net.minecraft.server.MinecraftServer.getServer().getRandom() : RandomSource.create()).nextInt(16777216); // Plazma - Reduce create random instance
++            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/util/datafix/fixes/EntityZombieVillagerTypeFix.java b/src/main/java/net/minecraft/util/datafix/fixes/EntityZombieVillagerTypeFix.java
-index 8311073e44ca8a2c8ac6f6864a875d6c90338664..8e488389b41c63809993262183204b77f73c0e55 100644
---- a/src/main/java/net/minecraft/util/datafix/fixes/EntityZombieVillagerTypeFix.java
-+++ b/src/main/java/net/minecraft/util/datafix/fixes/EntityZombieVillagerTypeFix.java
-@@ -8,7 +8,7 @@ import net.minecraft.util.RandomSource;
- 
- public class EntityZombieVillagerTypeFix extends NamedEntityFix {
-     private static final int PROFESSION_MAX = 6;
--    private static final RandomSource RANDOM = RandomSource.create();
-+    private static final RandomSource RANDOM = org.plazmamc.plazma.PlazmaOptions.createNewRandom() ? RandomSource.create() : net.minecraft.server.MinecraftServer.getServer().getRandom(); // Plazma - Reduce create random source
- 
-     public EntityZombieVillagerTypeFix(Schema outputSchema, boolean changesType) {
-         super(outputSchema, changesType, "EntityZombieVillagerTypeFix", References.ENTITY, "Zombie");
 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 fe3ab3d388f0481fb0db06b7f730f868dbf8e8a5..265d8479b5c02994dba4288060b842789ebc7179 100644
+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> {
-     public final List<ShufflingList.WeightedEntry<U>> entries; // Paper - public
+     protected final List<ShufflingList.WeightedEntry<U>> entries;
 -    private final RandomSource random = RandomSource.create();
-+    private final RandomSource random = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceCreateRandomInstance ? net.minecraft.server.MinecraftServer.getServer().getRandom() : RandomSource.create(); // Plazma
-     private final boolean isUnsafe; // Paper
++    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..288ae299240c9626e576a7ae1c45c53d83f7f097 100644
+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;
@@ -113,12 +99,12 @@ index 7094701d213c73ba47ace806962244c10fdf4dda..288ae299240c9626e576a7ae1c45c53d
  
  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.reduceCreateRandomInstance && org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.suppressThreadSafeRandom ? net.minecraft.server.MinecraftServer.getServer().getRandom() : RandomSource.createThreadSafe(); // Plazma - Reduce create random instance
++    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 ece82743df21f0b776382821ad75dee96d0a0748..c25affe40eea32e1964aa4c62fdd27faa37baf28 100644
+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 {
@@ -126,12 +112,12 @@ index ece82743df21f0b776382821ad75dee96d0a0748..c25affe40eea32e1964aa4c62fdd27fa
      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.reduceCreateRandomInstance ? net.minecraft.server.MinecraftServer.getServer().getRandom() : RandomSource.create()), 0, 2); // Plazma - Reduce create random instance
++    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 a5443f92786427c42092aec8350e7ab37704db7a..b1a44e460175b974e8830030ce61e523533bef8c 100644
+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 {
@@ -139,25 +125,25 @@ index a5443f92786427c42092aec8350e7ab37704db7a..b1a44e460175b974e8830030ce61e523
      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.reduceCreateRandomInstance ? net.minecraft.server.MinecraftServer.getServer().getRandom() : RandomSource.create(); // Plazma - reduce create random instace
++    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 a9eaa079a43bc8a5e81deaf6df5ce2f9c53cb319..f1b0b8fd1042f2ce8a514000d95df5123223cc27 100644
+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
-@@ -86,7 +86,7 @@ public class FishingHook extends Projectile {
+@@ -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.plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? world.getRandom() : RandomSource.create(); // Plazma - Reduce create random instance
++        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..75ba586277ece1aa56186679d3a8ebf0b3f7a0cb 100644
+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 {
@@ -165,7 +151,7 @@ index eaa2943b667967f93f28d9d794d702fdaeb670ec..75ba586277ece1aa56186679d3a8ebf0
      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.plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? world.getRandom() : RandomSource.create(); // Plazma - Reduce create random instace
++        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;
@@ -174,12 +160,12 @@ index eaa2943b667967f93f28d9d794d702fdaeb670ec..75ba586277ece1aa56186679d3a8ebf0
      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.plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? world.getRandom() : RandomSource.create(); // Plazma - Reduce create random instace
++        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 d604b7ec46f08993647979ed220a84842e3fe325..f2a3049252a37ca6d6d5cb1cc51d512c7ebf5679 100644
+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 {
@@ -187,28 +173,28 @@ index d604b7ec46f08993647979ed220a84842e3fe325..f2a3049252a37ca6d6d5cb1cc51d512c
              // Purpur end
          };
 -        this.random = RandomSource.create();
-+        this.random = playerInventory.player.level().plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? playerInventory.player.level().random : RandomSource.create(); // Plazma - Reduce create random instace
++        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 ef9b1687dd2dfda5398523140aecc678b4690642..66a1db10249995144490dac292e09fd0aa30f168 100644
+index 059e545fd04b7919fb0cc86797b636e3cda61027..8c90c4ff41b2a12cb6ba70d0bc80755ba8246872 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -82,7 +82,7 @@ public class Explosion {
+@@ -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) {
+     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.plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? world.getRandom() : RandomSource.create(); // Plazma - Reduce create random instace
++        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 1a5880ae3c3b17d49f0b083dff66e5619c08ec20..e175cde654b36d8ffc98a36ef099d22e9f1d15e9 100644
+index 4eb8cab1f7f2d3d2dcba15bb0bd64b60c027882a..11c864f3947b93f0ebeae8c6fd006a5891162b44 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -124,16 +124,16 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -122,16 +122,16 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public final Thread thread;
      private final boolean isDebug;
      private int skyDarken;
@@ -219,68 +205,55 @@ index 1a5880ae3c3b17d49f0b083dff66e5619c08ec20..e175cde654b36d8ffc98a36ef099d22e
      protected float oThunderLevel;
      public float thunderLevel;
      public final RandomSource random = RandomSource.create();
-+    protected int randValue = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceCreateRandomInstance ? random.nextInt() : RandomSource.create().nextInt(); // Plazma - Reduce create random instace
++    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.suppressThreadSafeRandom ? random : RandomSource.createThreadSafe(); // Plazma - Reduce create random instace
++    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/EnchantmentTableBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
-index b7370e64fd0d50e8725d7d5afc30af2e8bc8455d..b8d2c91a343478d89a5242254f3379dfa2556348 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
-@@ -22,7 +22,7 @@ public class EnchantmentTableBlockEntity extends BlockEntity implements Nameable
-     public float rot;
-     public float oRot;
-     public float tRot;
--    private static final RandomSource RANDOM = RandomSource.create();
-+    private static final RandomSource RANDOM = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceCreateRandomInstance ? net.minecraft.server.MinecraftServer.getServer().getRandom() : RandomSource.create(); // Plazma - Reduce create random instace
-     private Component name;
-     private int lapis = 0; // Purpur
- 
 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 7291e4056b8e46ab59b71818388ac55fbb12993f..22faea52bc54cdcb52ff18a9d5a8c1bd1a64fa73 100644
+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
-@@ -368,7 +368,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
+@@ -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.plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? world.getRandom() : RandomSource.create()), pos); // Plazma - Reduce create random instance
++        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 f8cd23fb6ea7909b8f30bd21d3f2c7bcc483ef21..c85340232624529d4685bf34035bb62d294695c9 100644
+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
-@@ -221,7 +221,7 @@ public class ChunkGeneratorStructureState {
+@@ -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.reduceCreateRandomInstance ? net.minecraft.server.MinecraftServer.getServer().getRandom() : RandomSource.create(); // Plazma - Reduce create random instace
++            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
+             // 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 18fce94f0d4b9d28e3afec61c7578f672973a71f..2dfb801ec15a372bcb997942969fec64aea9e49e 100644
+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
-@@ -62,7 +62,7 @@ public enum DragonRespawnAnimation {
+@@ -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));
  
-                         world.explode((Entity)null, (double)((float)endSpike.getCenterX() + 0.5F), (double)endSpike.getHeight(), (double)((float)endSpike.getCenterZ() + 0.5F), 5.0F, Level.ExplosionInteraction.BLOCK);
-                         SpikeConfiguration spikeConfiguration = new SpikeConfiguration(true, ImmutableList.of(endSpike), new BlockPos(0, 128, 0));
--                        Feature.END_SPIKE.place(spikeConfiguration, world, world.getChunkSource().getGenerator(), RandomSource.create(), new BlockPos(endSpike.getCenterX(), 45, endSpike.getCenterZ()));
-+                        Feature.END_SPIKE.place(spikeConfiguration, world, world.getChunkSource().getGenerator(), (world.plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? world.getRandom() : RandomSource.create()), new BlockPos(endSpike.getCenterX(), 45, endSpike.getCenterZ())); // Plazma - Reduce create random instance
+-                        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 (bl) {
-                     fight.setRespawnStage(SUMMONING_DRAGON);
+                 } 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 c1ff2e15bc5da1a642872ac0fdcdc457e8abb063..67b4a65980059b0b2d4929c619c400c48e201e18 100644
+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 {
@@ -288,45 +261,24 @@ index c1ff2e15bc5da1a642872ac0fdcdc457e8abb063..67b4a65980059b0b2d4929c619c400c4
              return iregistry.getHolder(EndFeatures.END_GATEWAY_DELAYED);
          }).ifPresent((holder_c) -> {
 -            ((ConfiguredFeature) holder_c.value()).place(this.level, this.level.getChunkSource().getGenerator(), RandomSource.create(), pos);
-+            ((ConfiguredFeature) holder_c.value()).place(this.level, this.level.getChunkSource().getGenerator(), (this.level.plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? this.level.getRandom() : RandomSource.create()), pos); // Plazma - Reduce create random instace
++            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
+         // 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.plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? this.level.getRandom() : RandomSource.create()), this.portalLocation)) { // Plazma - Reduce create random instace
++        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/net/minecraft/world/level/levelgen/WorldOptions.java b/src/main/java/net/minecraft/world/level/levelgen/WorldOptions.java
-index d38cabc9eeb45dd863e5f87b7df3b6327ea6a4a2..d4bcdbc6ea420bdb05c0a8859d368213d87dba67 100644
---- a/src/main/java/net/minecraft/world/level/levelgen/WorldOptions.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/WorldOptions.java
-@@ -77,6 +77,6 @@ public class WorldOptions {
-     }
- 
-     public static long randomSeed() {
--        return RandomSource.create().nextLong();
-+        return (org.plazmamc.plazma.PlazmaOptions.createNewRandom() ? RandomSource.create() : net.minecraft.server.MinecraftServer.getServer().getRandom()).nextLong(); // Plazma - Reduce create random instance
-     }
- }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 68c5af9b67a2834ee6e2f80ceefa19c3a982b8ed..aabbf9ae1b772c9101e6f36236e5d34a5620a4d3 100644
+index 1309fabd357eb9b8f90f882ec7ff3de9e60f187d..d300668899c3382a42e6a25dd084fb814b56f6bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-@@ -2,6 +2,8 @@ package org.bukkit.craftbukkit.entity;
- 
- import com.google.common.base.Preconditions;
- import java.util.Random;
-+
-+import net.minecraft.util.RandomSource;
- import net.minecraft.world.entity.projectile.FireworkRocketEntity;
- import net.minecraft.world.item.ItemStack;
- import net.minecraft.world.item.Items;
-@@ -14,11 +16,12 @@ import org.bukkit.inventory.meta.FireworkMeta;
+@@ -14,11 +14,12 @@ import org.bukkit.inventory.meta.FireworkMeta;
  
  public class CraftFirework extends CraftProjectile implements Firework {
  
@@ -336,59 +288,32 @@ index 68c5af9b67a2834ee6e2f80ceefa19c3a982b8ed..aabbf9ae1b772c9101e6f36236e5d34a
  
      public CraftFirework(CraftServer server, FireworkRocketEntity entity) {
          super(server, entity);
-+        this.random = this.getHandle().level().plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? this.getHandle().level().getRandom() : RandomSource.create(); // Plazma - Reduce create random instance
++        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
+ //        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/PlazmaOptions.java b/src/main/java/org/plazmamc/plazma/PlazmaOptions.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..4421110e20a006c3773e922eb0facc88174ffb43
---- /dev/null
-+++ b/src/main/java/org/plazmamc/plazma/PlazmaOptions.java
-@@ -0,0 +1,10 @@
-+package org.plazmamc.plazma;
-+
-+public class PlazmaOptions {
-+
-+    static final boolean DONT_CREATE_NEW_RANDOM_INSTANCE = Boolean.getBoolean("Plazma.doNotCreateRandomInstance");
-+    public static boolean createNewRandom() {
-+        return !DONT_CREATE_NEW_RANDOM_INSTANCE;
-+    }
-+
-+}
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 00c95194788d56f539d1c75e9a1ce48e950c096c..9e26e598d7c381368de422ab0c3cc7936e3bbb6d 100644
+index 294fdbba44191427a841f8ac82b18ed8d706f53e..be9e364a02eb872940443e3ba3349c3ccad3cb0f 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -18,7 +18,7 @@ public class GlobalConfiguration extends ConfigurationPart {
-     static void set(@NotNull GlobalConfiguration instance, boolean test) {
-         GlobalConfiguration.instance = instance;
-         if (test) {
--
-+            instance.misc.reduceCreateRandomInstance = false;
-         }
+@@ -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;
+ 
      }
  
-@@ -34,6 +34,9 @@ public class GlobalConfiguration extends ConfigurationPart {
+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;
  
-+        public boolean reduceCreateRandomInstance = DO_OPTIMIZE;
-+        public boolean suppressThreadSafeRandom = DO_OPTIMIZE;
-+
      }
  
-     public Player player;
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 36c367c577e61422e51ab08c5aaa2a88c94e1636..146af5bb54da67c134485dc67e8d9a569889434a 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-@@ -26,6 +26,8 @@ public class LevelConfigurations extends ConfigurationPart {
-     public Misc misc;
-     public class Misc extends ConfigurationPart {
- 
-+        public boolean reduceCreateRandomInstance = DO_OPTIMIZE;
-+
-     }
- 
-     public Entity entity;

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

@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 27 Sep 2023 22:21:47 +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 e001787e40cc0a843e65b36582e9d6593d0fff0e..1af44c18724b2d2dc1d910f5af49254eb845feaf 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1435,6 +1435,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                             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;
- 
-+                                if (this.player.getBukkitEntity().hasPermission("plazma.bypass-moved-to-quickly-check") || !this.player.level().plazmaLevelConfiguration().entity.player.checkSpectatorMovecToQuickly && this.player.isSpectator()) return; // Plazma
-                                 if (d10 - d9 > Math.max(f2, Math.pow((double) (org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed), 2)) && !this.isSingleplayerOwner()) {
-                                 // CraftBukkit end
-                                     // Paper start - Add fail move event
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 0a23900b18ec46ce2a7d47160dff013c7c8a8533..414baade911fab3450430af9378feedc419868f3 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-@@ -33,6 +33,13 @@ public class LevelConfigurations extends ConfigurationPart {
-     public Entity entity;
-     public class Entity extends ConfigurationPart {
- 
-+        public Player player;
-+        public class Player extends ConfigurationPart {
-+
-+            public boolean checkSpectatorMovecToQuickly = !DO_OPTIMIZE;
-+
-+        }
-+
-         public Phantom phantom;
-         public class Phantom extends ConfigurationPart {
- 

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

@@ -7,26 +7,27 @@ 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 1ca91631b03c9690b4f661ecfb4d500d23cb47ec..4461dc1b76cc2939130680f8039b69af902aa050 100644
+index 2092ede561d14ace1c003ced051cd4967bb41beb..0cf2180519457817a5985cf34e5564cd0ec1b1a2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2105,8 +2105,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2154,8 +2154,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      public void playerTouch(Player player) {}
  
      public void push(Entity entity) {
-+        if (entity.noPhysics || this.noPhysics) return; // Plazma
++        if (entity.noPhysics || this.noPhysics) return; // Plazma - Swaps the predicate order of collision
          if (!this.isPassengerOfSameVehicle(entity)) {
 -            if (!entity.noPhysics && !this.noPhysics) {
-+            //if (!entity.noPhysics && !this.noPhysics) { // Plazma - moved up
-                 if (this.level.paperConfig().collisions.onlyPlayersCollide && !(entity instanceof ServerPlayer || this instanceof ServerPlayer)) return; // Paper
++            //if (!entity.noPhysics && !this.noPhysics) { // Plazma - Swaps the predicate order of collision
+                 if (this.level.paperConfig().collisions.onlyPlayersCollide && !(entity instanceof ServerPlayer || this instanceof ServerPlayer)) return; // Paper - Collision option for requiring a player participant
                  double d0 = entity.getX() - this.getX();
                  double d1 = entity.getZ() - this.getZ();
-@@ -2135,7 +2136,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2183,8 +2184,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+                         entity.push(d0, 0.0D, d1);
                      }
                  }
- 
+-
 -            }
-+            //} // Plazma
++            //} // Plazma - Swaps the predicate order of collision
          }
      }
  

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

@@ -5,25 +5,25 @@ 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 36af81f0957d17e170d229059c66f4eb4539dfeb..b4b74bff0579b919266e91464b36c9381342b677 100644
+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
-@@ -56,7 +56,8 @@ public class PlayerDataStorage {
+@@ -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
++            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() )
-@@ -67,7 +68,7 @@ public class PlayerDataStorage {
+@@ -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);
+                 nbttagcompound = NbtIo.readCompressed(file.toPath(), NbtAccounter.unlimitedHeap());
              }
              // Spigot Start

patches/server/0021-Use-faster-random.patch

@@ -1,471 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 27 Sep 2023 22:30:49 +0900
-Subject: [PATCH] Use faster random
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
-index 5408cbc21fc7577a6100b5a1ca0463e899d2df8b..f17b42176e9e5148b98baf4a6a7e7528242406d9 100644
---- a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
-+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
-@@ -16,7 +16,7 @@ import java.util.UUID;
- 
- public class PaperLootableInventoryData {
- 
--    private static final Random RANDOM = new Random();
-+    private static final Random RANDOM = org.plazmamc.plazma.PlazmaOptions.useJavaRandom() ? new Random() : new org.plazmamc.plazma.Random(); // Plazma - use faster random
- 
-     private long lastFill = -1;
-     private long nextRefill = -1;
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ee571f465ca1e83e760a4d57b3d11accb53c6cfe..1a92a7f6391df6395c11d11efdbf2f4eda5c6651 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -680,7 +680,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             ChunkPos chunkcoordintpair = new ChunkPos(chunkproviderserver.randomState().sampler().findSpawnPosition());
-             // CraftBukkit start
-             if (world.generator != null) {
--                Random rand = new Random(world.getSeed());
-+                Random rand = org.plazmamc.plazma.PlazmaOptions.useJavaRandom() ? new Random(world.getSeed()) : new org.plazmamc.plazma.Random((int) world.getSeed()); // Plazma - use faster random
-                 org.bukkit.Location spawn = world.generator.getFixedSpawnLocation(world.getWorld(), rand);
- 
-                 if (spawn != null) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 52b48e40c3ee5f483c6cb04409459cf25abc3f0d..5ca738739507a4cb1c3b17502fa82462079cbc87 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -228,7 +228,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
-     }
-     // Paper end
- 
--    private static final Random rand = new Random();
-+    private static final Random rand = org.plazmamc.plazma.PlazmaOptions.useJavaRandom() ? new Random() : new org.plazmamc.plazma.Random(); // Plazma - use faster random
- 
-     public CraftWorld(ServerLevel world, ChunkGenerator gen, BiomeProvider biomeProvider, Environment env) {
-         this.world = world;
-diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-index d46ccc3b3aaacf937631a44a7e0f91b793a83c86..0be5ab95612dc21561ffc0051880baae75117bc6 100644
---- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-+++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-@@ -48,7 +48,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator {
-     private final net.minecraft.world.level.chunk.ChunkGenerator delegate;
-     private final ChunkGenerator generator;
-     private final ServerLevel world;
--    private final Random random = new Random();
-+    private final Random random = org.plazmamc.plazma.PlazmaOptions.useJavaRandom() ? new Random() : new org.plazmamc.plazma.Random(); // Plazma - use faster random
-     private boolean newApi;
-     private boolean implementBaseHeight = true;
- 
-diff --git a/src/main/java/org/plazmamc/plazma/PlazmaOptions.java b/src/main/java/org/plazmamc/plazma/PlazmaOptions.java
-index 4421110e20a006c3773e922eb0facc88174ffb43..f0e6933a2bf06f2bcc343c0817ca414473be19d3 100644
---- a/src/main/java/org/plazmamc/plazma/PlazmaOptions.java
-+++ b/src/main/java/org/plazmamc/plazma/PlazmaOptions.java
-@@ -7,4 +7,7 @@ public class PlazmaOptions {
-         return !DONT_CREATE_NEW_RANDOM_INSTANCE;
-     }
- 
-+    static final boolean USE_JAVA_RANDOM = Boolean.getBoolean("Plazma.useJavaRandom");
-+    public static boolean useJavaRandom() { return USE_JAVA_RANDOM; }
-+
- }
-diff --git a/src/main/java/org/plazmamc/plazma/Random.java b/src/main/java/org/plazmamc/plazma/Random.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..d0aa8248c0f9dc6daab6eee6b77d3ef198d75fdb
---- /dev/null
-+++ b/src/main/java/org/plazmamc/plazma/Random.java
-@@ -0,0 +1,395 @@
-+package org.plazmamc.plazma;
-+
-+/**
-+ + This is a faster implementation of java.util.Random
-+ + Code from <a href="https://gist.github.com/Xyene/4637619">...</a> by Xyene
-+ + Licensed unser GNU LGPL v3.0
-+ + <p>
-+ * A random number generator based on the simple and fast xor-shift pseudo
-+ * random number generator (RNG) specified in:
-+ * Marsaglia, George. (2003). Xorshift RNGs.
-+ * <a href="http://www.jstatsoft.org/v08/i14/xorshift.pdf">...</a>
-+ * Translated from:
-+ * <a href="http://www.codeproject.com/Articles/9187/A-fast-equivalent-for-System-Random">...</a>.
-+ */
-+@SuppressWarnings("SuspiciousNameCombination")
-+public class Random extends java.util.Random {
-+    final double REAL_UNIT_INT = 1.0 / (0x7FFFFFFFL);
-+    final double REAL_UNIT_UINT = 1.0 / (0xFFFFFFFFL);
-+    final long Y = 842502087L, Z = 3579807591L, W = 273326509L;
-+    long x, y, z, w;
-+
-+    public Random() {
-+        this((int) System.currentTimeMillis());
-+    }
-+
-+    public Random(int value) {
-+        seed(value);
-+    }
-+
-+    @Override
-+    public void setSeed(long seed) {
-+        seed((int) seed);
-+    }
-+
-+    public void seed(int seed) {
-+        // The only stipulation stated for the xorshift RNG is that at least one of
-+        // the seeds x,y,z,w is non-zero. We fulfill that requirement by only allowing
-+        // resetting of the x seed
-+        x = seed;
-+        y = Y;
-+        z = Z;
-+        w = W;
-+    }
-+
-+    long boolBuffer;
-+    int boolBufferBits = 0;
-+
-+    @Override
-+    public boolean nextBoolean() {
-+        if (boolBufferBits == 0) {
-+            boolBuffer = nextUInt();
-+            boolBufferBits = 32;
-+        }
-+        boolBuffer >>= 1;
-+        boolean bit = (boolBuffer & 1) == 0;
-+        --boolBufferBits;
-+        return bit;
-+    }
-+
-+    @Override
-+    public void nextBytes(byte[] buffer) {
-+        // Fill up the bulk of the buffer in chunks of 4 bytes at a time.
-+        long x = this.x, y = this.y, z = this.z, w = this.w;
-+        int i = 0;
-+        long t;
-+        for (int bound = buffer.length - 3; i < bound; ) {
-+            // Generate 4 bytes.
-+            // Increased performance is achieved by generating 4 random bytes per loop.
-+            // Also note that no mask needs to be applied to zero out the higher order bytes before
-+            // casting because the cast ignores thos bytes. Thanks to Stefan Trosch黷z for pointing this out.
-+            t = (x ^ (x << 11));
-+            x = y;
-+            y = z;
-+            z = w;
-+            w = (w ^ (w >> 19)) ^ (t ^ (t >> 8));
-+
-+            buffer[i++] = (byte) w;
-+            buffer[i++] = (byte) (w >> 8);
-+            buffer[i++] = (byte) (w >> 16);
-+            buffer[i++] = (byte) (w >> 24);
-+        }
-+
-+        // Fill up any remaining bytes in the buffer.
-+        if (i < buffer.length) {
-+            // Generate 4 bytes.
-+            t = (x ^ (x << 11));
-+            x = y;
-+            y = z;
-+            z = w;
-+            w = (w ^ (w >> 19)) ^ (t ^ (t >> 8));
-+
-+            buffer[i++] = (byte) w;
-+            if (i < buffer.length) {
-+                buffer[i++] = (byte) (w >> 8);
-+                if (i < buffer.length) {
-+                    buffer[i++] = (byte) (w >> 16);
-+                    if (i < buffer.length) buffer[i] = (byte) (w >> 24);
-+                }
-+            }
-+        }
-+        this.x = x;
-+        this.y = y;
-+        this.z = z;
-+        this.w = w;
-+    }
-+
-+    @Override
-+    public double nextDouble() {
-+        long t = (x ^ (x << 11));
-+        x = y;
-+        y = z;
-+        z = w;
-+
-+        // Here we can gain a 2x speed improvement by generating a value that can be cast to
-+        // an int instead of the more easily available uint. If we then explicitly cast to an
-+        // int the compiler will then cast the int to a double to perform the multiplication,
-+        // this final cast is a lot faster than casting from a uint to a double. The extra cast
-+        // to an int is very fast (the allocated bits remain the same) and so the overall effect
-+        // of the extra cast is a significant performance improvement.
-+        //
-+        // Also note that the loss of one bit of precision is equivalent to what occurs within
-+        // System.Random.
-+        return (REAL_UNIT_INT * (int) (0x7FFFFFFF & (w = (w ^ (w >> 19)) ^ (t ^ (t >> 8)))));
-+    }
-+
-+    public double random() {
-+        return nextDouble();
-+    }
-+
-+    @Override
-+    public float nextFloat() {
-+        return (float) nextDouble();
-+    }
-+
-+    @Override
-+    public int nextInt() {
-+        long t = (x ^ (x << 11));
-+        x = y;
-+        y = z;
-+        z = w;
-+        return (int) (0x7FFFFFFF & (w = (w ^ (w >> 19)) ^ (t ^ (t >> 8))));
-+    }
-+
-+    @Override
-+    public int nextInt(int upperBound) {
-+        if (upperBound < 0)
-+            throw new IllegalArgumentException("upperBound must be >=0");
-+
-+        long t = (x ^ (x << 11));
-+        x = y;
-+        y = z;
-+        z = w;
-+
-+        return (int) ((REAL_UNIT_INT * (int) (0x7FFFFFFF & (w = (w ^ (w >> 19)) ^ (t ^ (t >> 8))))) * upperBound);
-+    }
-+
-+    public int nextInt(int lowerBound, int upperBound) {
-+        if (lowerBound > upperBound)
-+            throw new IllegalArgumentException("upperBound must be >=lowerBound");
-+
-+        long t = (x ^ (x << 11));
-+        x = y;
-+        y = z;
-+        z = w;
-+
-+        // The explicit int cast before the first multiplication gives better performance.
-+        // See comments in NextDouble.
-+        int range = upperBound - lowerBound;
-+        if (range < 0)
-+            // If range is <0 then an overflow has occured and must resort to using long integer arithmetic instead (slower).
-+            // We also must use all 32 bits of precision, instead of the normal 31, which again is slower.
-+            return lowerBound + (int) ((REAL_UNIT_UINT * (double) (w = (w ^ (w >> 19)) ^ (t ^ (t >> 8)))) * (double) ((long) upperBound - (long) lowerBound));
-+        // 31 bits of precision will suffice if range<=int.MaxValue. This allows us to cast to an int and gain
-+        // a little more performance.
-+        return lowerBound + (int) ((REAL_UNIT_INT * (double) (int) (0x7FFFFFFF & (w = (w ^ (w >> 19)) ^ (t ^ (t >> 8))))) * (double) range);
-+    }
-+
-+    public long nextUInt() {
-+        long t = (x ^ (x << 11));
-+        x = y;
-+        y = z;
-+        z = w;
-+        return (w = (w ^ (w >> 19)) ^ (t ^ (t >> 8))) & (0xFFFFFFFFL);
-+    }
-+
-+    @Override
-+    public long nextLong() {
-+        return nextUInt() << 32 + nextUInt();
-+    }
-+
-+    double gaussNext;
-+    boolean hasGaussNext;
-+    final double TWOPI = Math.PI * 2;
-+
-+    /**
-+     * Get a random number in the range [min, max) or [min, max] depending on rounding.
-+     *
-+     * @param min Low bound
-+     * @param max High bound
-+     * @return A uniformly distributed double
-+     */
-+    public double uniform(double min, double max) {
-+        return min + (max - min) * nextDouble();
-+    }
-+
-+    /**
-+     * Triangular distribution.
-+     * <p/>
-+     * Continuous distribution bounded by given lower and upper limits,
-+     * and having a given mode value in-between.
-+     * http://en.wikipedia.org/wiki/Triangular_distribution
-+     *
-+     * @param low  Low bound
-+     * @param high High bound
-+     * @param mode Mode
-+     * @return A number from the triangular distribution specified
-+     */
-+    public double triangular(int low, int high, int mode) {
-+        double u = nextDouble();
-+        double c = (mode - low) / (high - low);
-+        if (u > c) {
-+            u = 1.0 - u;
-+            c = 1.0 - c;
-+            int k = low;
-+            low = high;
-+            high = k;
-+        }
-+        return low + (high - low) * Math.sqrt(u * c);
-+    }
-+
-+    /**
-+     * Gaussian distribution, mean is 0 and standard deviation is 1.
-+     * <p/>
-+     * mu is the mean, and sigma is the standard deviation.
-+     *
-+     * @return A double in Gaussian distribution
-+     */
-+    public double gauss() {
-+        return nextGaussian();
-+    }
-+
-+    /**
-+     * Gaussian distribution, with user-specified mean and standard deviation.
-+     * <p/>
-+     * mu is the mean, and sigma is the standard deviation.
-+     *
-+     * @return A double in Gaussian distribution
-+     */
-+    public double gauss(double mu, double sigma) {
-+        return mu + sigma * nextGaussian();
-+    }
-+
-+    public double gaussUnsigned(double mu, double sigma) {
-+        double out = gauss(mu, sigma);
-+        return out > 1 ? out : 1;
-+    }
-+
-+    /**
-+     * Log normal distribution.
-+     * <p/>
-+     * If you take the natural logarithm of this distribution, you'll get a
-+     * normal distribution with mean mu and standard deviation sigma.
-+     * mu can have any value, and sigma must be greater than zero.
-+     *
-+     * @param mu    Mean
-+     * @param sigma Standard deviation
-+     * @return A number from the log normal distribution specified
-+     */
-+    public double logNormal(double mu, double sigma) {
-+        return Math.exp(gauss(mu, sigma));
-+    }
-+
-+    /**
-+     * Exponential distribution.
-+     * <p/>
-+     * lambda is 1.0 divided by the desired mean.  It should be
-+     * nonzero. Returned values range from 0 to positive infinity
-+     * if lambda is positive, and from negative infinity to 0
-+     * if lambda is negative.
-+     *
-+     * @param lambda A non-zero value
-+     */
-+    public double exponential(double lambda) {
-+        return -Math.log(1.0 - random()) / lambda;
-+    }
-+
-+    /**
-+     * Circular data distribution.
-+     * <p/>
-+     * If kappa is equal to zero, this distribution reduces
-+     * to a uniform random angle over the range 0 to 2*pi.
-+     *
-+     * @param mu    the mean angle, expressed in radians between 0 and 2*pi.
-+     * @param kappa the concentration parameter, which must be greater than or
-+     *              equal to zero.
-+     * @return A number from the circular data distribution specified
-+     */
-+    public double circularData(double mu, double kappa) {
-+        if (kappa <= 1e-6)
-+            return TWOPI * nextDouble();
-+
-+        double a = 1.0 + Math.sqrt(1.0 + 4.0 * kappa * kappa);
-+        double b = (a - Math.sqrt(2.0 * a)) / (2.0 * kappa);
-+        double r = (1.0 + b * b) / (2.0 * b);
-+        double u1, u2, u3, f, c, z, theta = 0;
-+
-+        while (true) {
-+            u1 = nextDouble();
-+
-+            z = Math.cos(Math.PI * u1);
-+            f = (1.0 + r * z) / (r + z);
-+            c = kappa * (r - f);
-+
-+            u2 = nextDouble();
-+
-+            if (u2 < c * (2.0 - c) || u2 <= c * Math.exp(1.0 - c))
-+                break;
-+
-+            u3 = nextDouble();
-+            if (u3 > 0.5)
-+                theta = (mu % TWOPI) + Math.acos(f);
-+            else
-+                theta = (mu % TWOPI) - Math.acos(f);
-+        }
-+        return theta;
-+    }
-+
-+
-+    final double LOG4 = Math.log(4);
-+    final double SG_MAGICCONST = 1.0 + Math.log(4.5);
-+
-+    /**
-+     * Gamma distribution.  Not the gamma function!
-+     * Conditions on the parameters are alpha > 0 and beta > 0.
-+     * <p/>
-+     * The probability distribution function is:
-+     * pdf(x) = (x ** (alpha - 1) * math.exp(-x / beta)) / (math.gamma(alpha) * beta ** alpha)
-+     *
-+     * @param alpha Alpha
-+     * @param beta  Beta
-+     * @return A number from the gamma distribution specified
-+     */
-+    public double gamma(double alpha, double beta) {
-+        if (alpha <= 0.0 || beta <= 0.0)
-+            throw new IllegalArgumentException("alpha and beta must be > 0.0");
-+
-+        if (alpha > 1.0) {
-+            double ainv = Math.sqrt(2.0 * alpha - 1.0);
-+            double bbb = alpha - LOG4;
-+            double ccc = alpha + ainv;
-+            double u1, u2, v, x, z, r;
-+
-+            while (true) {
-+                u1 = random();
-+                if (!(1e-7 < u1 && u1 < .9999999))
-+                    continue;
-+                u2 = 1.0 - random();
-+                v = Math.log(u1 / (1.0 - u1)) / ainv;
-+                x = alpha * Math.exp(v);
-+                z = u1 * u1 * u2;
-+                r = bbb + ccc * v - x;
-+                if (r + SG_MAGICCONST - 4.5 * z >= 0.0 || r >= Math.log(z))
-+                    return x * beta;
-+            }
-+        } else if (alpha == 1.0) {
-+            // exponential(1)
-+            double u;
-+            u = random();
-+            while (u <= 1e-7)
-+                u = random();
-+            return -Math.log(u) * beta;
-+        } else {
-+            // alpha is between 0 and 1 (exclusive)
-+            // Uses ALGORITHM GS of Statistical Computing -Kennedy & Gentle
-+
-+            double u, b, p, x, u1;
-+            while (true) {
-+                u = random();
-+                b = (Math.E + alpha) / Math.E;
-+                p = b * u;
-+                if (p <= 1.0)
-+                    x = Math.pow(p, (1.0 / alpha));
-+                else
-+                    x = -Math.log((b - p) / alpha);
-+                u1 = random();
-+                if (p > 1.0) {
-+                    if (u1 <= Math.pow(x, (alpha - 1.0)))
-+                        break;
-+                } else if (u1 <= Math.exp(-x))
-+                    break;
-+            }
-+            return x * beta;
-+        }
-+    }
-+}

patches/server/0022-Do-not-refresh-LootTable-for-non-player-interaction.patch

@@ -0,0 +1,30 @@
+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-Do-not-load-chunks-to-spawn-phantom.patch

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

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

@@ -0,0 +1,31 @@
+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-Implement-FixMySpawnR.patch

@@ -1,91 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Fri, 29 Sep 2023 21:10:26 +0900
-Subject: [PATCH] Implement FixMySpawnR
-
-
-diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 64d911bee1607880514061c75116d8672df8bb8f..7868590696f620cc5f0785125c9573d7494d8477 100644
---- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-@@ -46,6 +46,8 @@ public abstract class BaseSpawner {
-     public int requiredPlayerRange = 16;
-     public int spawnRange = 4;
-     private int tickDelay = 0; // Paper
-+    private int blockExistsTick = 0; // Plazma - Implement FixMySpawnR
-+    private boolean blockLockedByTime = false; // Plazma - Implement FixMySpawnR
- 
-     public BaseSpawner() {}
- 
-@@ -81,6 +83,17 @@ public abstract class BaseSpawner {
-     }
- 
-     public void serverTick(ServerLevel world, BlockPos pos) {
-+        // Plazma start - Implement FixMySpawnR
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().gameMechanics.spawning.deadlockTimer.enabled) {
-+            if (!this.blockLockedByTime) {
-+                if (this.blockExistsTick > org.plazmamc.plazma.configurations.GlobalConfiguration.get().gameMechanics.spawning.deadlockTimer.timerTimeout)
-+                    blockLockedByTime = true;
-+                else blockExistsTick++;
-+            }
-+
-+            if (blockLockedByTime && world.getBestNeighborSignal(pos) > 0) return;
-+        }
-+        // Plazma end
-         if (spawnCount <= 0 || maxNearbyEntities <= 0) return; // Paper - Ignore impossible spawn tick
-         // Paper start - Configurable mob spawner tick rate
-         if (spawnDelay > 0 && --tickDelay > 0) return;
-@@ -286,6 +299,14 @@ public abstract class BaseSpawner {
-             this.spawnRange = nbt.getShort("SpawnRange");
-         }
- 
-+        // Plazma start - Implement FixMySpawnR
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().gameMechanics.spawning.deadlockTimer.enabled
-+                && nbt.contains("Plazma.SpawnerTicks", 99)) {
-+            this.blockExistsTick = nbt.getInt("Plazma.SpawnerTicks");
-+            this.blockLockedByTime = nbt.getBoolean("Plazma.SpawnerLocked");
-+        }
-+        // Plazma end
-+
-         this.displayEntity = null;
-     }
- 
-@@ -314,6 +335,9 @@ public abstract class BaseSpawner {
-             }));
-         }
- 
-+        nbt.putInt("Plazma.SpawnerTicks", this.blockExistsTick); // Plazma - Implement FixMySpawnR
-+        nbt.putBoolean("Plazma.SpawnerLocked", this.blockLockedByTime); // Plazma - Implement FixMySpawnR
-+
-         nbt.put("SpawnPotentials", (Tag) SpawnData.LIST_CODEC.encodeStart(NbtOps.INSTANCE, this.spawnPotentials).result().orElseThrow());
-         return nbt;
-     }
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 989aa0aeb05a878945849adc6fb6663027e15927..d17df5621717b1c8d1d9a5549feb73c3600ecf3d 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -40,6 +40,24 @@ public class GlobalConfiguration extends ConfigurationPart {
- 
-     }
- 
-+    public GameMechanics gameMechanics;
-+    public class GameMechanics extends ConfigurationPart {
-+
-+        public Spawning spawning;
-+        public class Spawning extends ConfigurationPart {
-+
-+            public DeadlockTimer deadlockTimer;
-+            public class DeadlockTimer extends ConfigurationPart {
-+
-+                public boolean enabled = DO_OPTIMIZE;
-+                public int timerTimeout = 0;
-+
-+            }
-+
-+        }
-+
-+    }
-+
-     public Player player;
-     public class Player extends ConfigurationPart {
- 

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

@@ -3,30 +3,31 @@ 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 40f51062624161892c780ddae05e22859e2cd021..b0b515b8ebeffe25a760d7d6faa87cbc1a585b2d 100644
+index bdcfd80f937c34956911373905d66424bbff8e1d..6c575aeeef323c8eb0837eb9d9eea8fcff21da17 100644
 --- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
 +++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-@@ -139,9 +139,13 @@ public class FriendlyByteBuf extends ByteBuf {
-     public <T> void writeJsonWithCodec(Codec<T> codec, T value) {
+@@ -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));
-+        // Plazma end
++        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..4f0d6ac849dda74c9180fa03d97d389cc4554b46 100644
+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
@@ -41,10 +42,10 @@ index b8c1f3b9afddc87d56541c8af63cffecfcdd2653..4f0d6ac849dda74c9180fa03d97d389c
 +            return ArgumentSignatures.EMPTY;
 +        return this.argumentSignatures;
 +    }
-+    // Plazma end
++    // 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..b32e17ef1d7d65f2e3cf4fb5471d8182b3ba892f 100644
+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
@@ -58,10 +59,10 @@ index d1d2fc0c57523c1abf1e8bfec913c78927c3dafc..b32e17ef1d7d65f2e3cf4fb5471d8182
 +        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.enabled) return null;
 +        return this.signature;
 +    }
-+    // Plazma end
++    // 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..4d9f73add791cef03cc7aeaf1598a73c2195809a 100644
+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
@@ -76,45 +77,63 @@ index 9d6db4a378036559efab91c8b7dcf2a6b0c2cce6..4d9f73add791cef03cc7aeaf1598a73c
 +            );
 +            return;
 +        }
-+        // Plazma end
++        // 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 879c090d9c4574a2cd45a0eb1bf9cb171834d940..d6e8d96372d4212c72a50602207075ccd3f5062d 100644
+index 2a73508dd8a59c6af8b65ab2db97b6e20b104c57..eb6bcea28df735efe53ed62080bb726f7314c280 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -683,6 +683,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -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();
  
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.enabled) return false; // Plazma - Implement No Chat Reports
-         return dedicatedserverproperties.enforceSecureProfile && dedicatedserverproperties.onlineMode && this.services.profileKeySignatureValidator() != null;
-     }
- 
+         // 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 6f6228edfe77668552a40a814ab3cebd74c4cb5a..22f26761965d3c03b109939585ff528d382eab21 100644
+index 02e65b0bd212d46855baee48fab35dc95a88b43f..59c96512dcdac551e9919c3893e1340f86e3e861 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -270,6 +270,13 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -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) {
-+            this.send(new net.minecraft.network.protocol.game.ClientboundSystemChatPacket(null, Component.Serializer.toJson(p.chatType().resolve(this.player.level().registryAccess()).get().decorate(p.unsignedContent() != null ? p.unsignedContent() : Component.literal(p.body().content()))), false), null);
++            impl.send(p);
 +            return;
 +        }
-+        // Plazma end
++        // 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 58cc1bed851994fb591e9b832b98d25eda153b47..4fbe96813067d3ccf1d8f29151ac3fac0840d76f 100644
+index ef4b1fb1532e1939d9a7e5337edc80b334b78318..f3b081abd82036c928655923c44a62a0e9889031 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1471,6 +1471,7 @@ public abstract class PlayerList {
+@@ -1499,6 +1499,7 @@ public abstract class PlayerList {
      }
  
      public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public
@@ -123,14 +142,13 @@ index 58cc1bed851994fb591e9b832b98d25eda153b47..4fbe96813067d3ccf1d8f29151ac3fac
      }
  
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 5a62bffe495002b3bbf5fd995df135c5d174458a..989aa0aeb05a878945849adc6fb6663027e15927 100644
+index e1c4551a83f8ce996ebed3e2ba7bf50cd532d6ac..62d891f05b90b323f0282fe26665965a10c317e6 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -55,4 +55,22 @@ public class GlobalConfiguration extends ConfigurationPart {
-         public boolean notSecurePrefix = true;
+@@ -80,4 +80,22 @@ public class GlobalConfiguration extends ConfigurationPart {
  
      }
-+
+ 
 +    public NoChatReports noChatReports;
 +    public class NoChatReports extends ConfigurationPart {
 +
@@ -148,4 +166,5 @@ index 5a62bffe495002b3bbf5fd995df135c5d174458a..989aa0aeb05a878945849adc6fb66630
 +        }
 +
 +    }
++
  }

patches/server/0026-Configurable-sensor-tick.patch

@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Fri, 29 Sep 2023 21:12:38 +0900
-Subject: [PATCH] Configurable 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 fb5c21ba15995d00da87ee6ef9e4ab8f6678d67f..4710f85197bc80e554cc1b2b84058c8dc8049c1f 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -938,10 +938,10 @@ public abstract class Mob extends LivingEntity implements Targeting {
-         }
-         // Paper end
-         //this.level().getProfiler().push("sensing"); // Purpur
--        this.sensing.tick();
-         //this.level().getProfiler().pop(); // Purpur
-         int i = this.level().getServer().getTickCount() + this.getId();
- 
-+        if (i % this.level().plazmaLevelConfiguration().entity.sensorTick == 0) this.sensing.tick(); // Plazma - moved down
-         if (i % 2 != 0 && this.tickCount > 1) {
-             //this.level().getProfiler().push("targetSelector"); // Purpur
-             if (this.targetSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index bb0f561f0b0d71697de52c834d2ed1798b2022df..6711b3d93eb5292314bcd89280d88f367eada9df 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-@@ -33,6 +33,8 @@ public class LevelConfigurations extends ConfigurationPart {
-     public Entity entity;
-     public class Entity extends ConfigurationPart {
- 
-+        public int sensorTick = DO_OPTIMIZE ? 10 : 1;
-+
-         public boolean ignoreUselessPackets = DO_OPTIMIZE;
- 
-         public Player player;

patches/server/0026-Ignore-useless-entity-packets.patch

@@ -3,25 +3,27 @@ From: AlphaKR93 <dev@alpha93.kr>
 Date: Wed, 27 Sep 2023 22:35:19 +0900
 Subject: [PATCH] Ignore useless entity packets
 
+[REFERENCE]
+- PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index c6d80accdac49564b5386717a92dbd5a10237f06..ddbff17499746cd370fdf18ff78606b0ac770df4 100644
+index cf098d4a3111771c13766285c5ec5f1fc1f539a4..433e9a06db191f8a0ff6c23d1ac6122606e67959 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -200,6 +200,8 @@ public class ServerEntity {
+@@ -207,6 +207,8 @@ public class ServerEntity {
                          flag4 = true;
                          flag5 = true;
                      }
 +
-+                    if (this.entity.level().plazmaLevelConfiguration().entity.ignoreUselessPackets && isUselessPacket(packet1)) packet1 = null; // Plazma
++                    if (this.level.plazmaConfig().entity.ignoreUselessPackets && isUselessPacket(packet1)) packet1 = null; // Plazma - Ignore useless entity packets
                  }
  
                  if ((this.trackDelta || this.entity.hasImpulse || this.entity instanceof LivingEntity && ((LivingEntity) this.entity).isFallFlying()) && this.tickCount > 0) {
-@@ -272,6 +274,19 @@ public class ServerEntity {
+@@ -281,6 +283,19 @@ public class ServerEntity {
          });
      }
  
-+    // Plazma start
++    // Plazma start - Ignore useless entity packets
 +    private boolean isUselessPacket(@Nullable Packet<?> packet) {
 +        if (!(packet instanceof ClientboundMoveEntityPacket p)) return false;
 +        if (p instanceof ClientboundMoveEntityPacket.Pos)
@@ -32,21 +34,21 @@ index c6d80accdac49564b5386717a92dbd5a10237f06..ddbff17499746cd370fdf18ff78606b0
 +            return p.getXa() == 0 && p.getYa() == 0 && p.getZa() == 0 && p.getxRot() == 0 && p.getyRot() == 0;
 +        return false;
 +    }
-+    // Plazma end
++    // Plazma end - Ignore useless entity packets
 +
      public void removePairing(ServerPlayer player) {
          this.entity.stopSeenByPlayer(player);
          player.connection.send(new ClientboundRemoveEntitiesPacket(new int[]{this.entity.getId()}));
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 414baade911fab3450430af9378feedc419868f3..914cc4f9a5598d2d70c7338d7cfc9be0fe5f0e31 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-@@ -33,6 +33,8 @@ public class LevelConfigurations extends ConfigurationPart {
+diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
+index 036c0b12553ae203e8c73d44dc2e3d625b812af5..909a74c19501d9440f3d2435b6514d738efcfc05 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
+@@ -29,6 +29,8 @@ public class WorldConfigurations extends ConfigurationPart {
      public Entity entity;
      public class Entity extends ConfigurationPart {
  
-+        public boolean ignoreUselessPackets = DO_OPTIMIZE;
++        public boolean ignoreUselessPackets = OPTIMIZE;
 +
-         public Player player;
-         public class Player extends ConfigurationPart {
+         public Phantom phantom;
+         public class Phantom extends ConfigurationPart {
  

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

@@ -1,11 +1,13 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Thu, 28 Sep 2023 12:33:14 +0900
+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 ed439b7e94646141c93a7dd3704d1cdeb5c27e16..71880b6fde3a287aa75c3799ffdd82a7943bb9db 100644
+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 {
@@ -13,7 +15,7 @@ index ed439b7e94646141c93a7dd3704d1cdeb5c27e16..71880b6fde3a287aa75c3799ffdd82a7
      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 BiomeTemperatureCache
++    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) {
@@ -22,7 +24,7 @@ index ed439b7e94646141c93a7dd3704d1cdeb5c27e16..71880b6fde3a287aa75c3799ffdd82a7
          long l = blockPos.asLong();
          // Pufferfish start
 -        gg.airplane.structs.Long2FloatAgingCache cache = this.temperatureCache.get();
-+        gg.airplane.structs.Long2FloatAgingCache cache = temperatureCache.get(); // Plazma - Improve BiomeTemperatureCache
++        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-Configurable-entity-sensor-tick.patch

@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Mon, 6 Nov 2023 11:36:08 +0900
+Subject: [PATCH] Configurable entity sensor tick
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
+index 546b14cc2cf0c4145a059142aa33ad113d7479bf..0c1e3cb455d2a184ab9f0084d10bd7cde83f9027 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 {
+         }
+         // Paper end - Allow nerfed mobs to jump and float
+         //this.level().getProfiler().push("sensing"); // Purpur
+-        this.sensing.tick();
++        //this.sensing.tick(); // Plazma - Moved down
+         //this.level().getProfiler().pop(); // Purpur
+         int i = this.level().getServer().getTickCount() + 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
+             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
+--- 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 {
+     public class Entity extends ConfigurationPart {
+ 
+         public boolean ignoreUselessPackets = OPTIMIZE;
++        public int sensorTick = 1;
+ 
+         public Phantom phantom;
+         public class Phantom extends ConfigurationPart {

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

@@ -0,0 +1,57 @@
+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-Suppress-error-from-dirty-attributes.patch

@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sat, 30 Sep 2023 22:06:00 +0900
-Subject: [PATCH] Suppress error from dirty attributes
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index b2770e053f6db173dedbf044d67aa315e2fd7302..30b4c6bf1a0c847d00fc466ca9c997f9049bb697 100644
---- a/src/main/java/net/minecraft/server/level/ServerEntity.java
-+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -395,7 +395,8 @@ public class ServerEntity {
-         }
- 
-         if (this.entity instanceof LivingEntity) {
--            Set<AttributeInstance> set = ((LivingEntity) this.entity).getAttributes().getDirtyAttributes();
-+            Set<AttributeInstance> attributes = ((LivingEntity) this.entity).getAttributes().getDirtyAttributes(); // Plazma - Suppress error from dirty attributes
-+            final Set<AttributeInstance> set = this.entity.level().plazmaLevelConfiguration().entity.suppressErrorFromDirtyAttributes ? java.util.Collections.synchronizedSet(attributes) : attributes; // Plazma - Suppress error from dirty attributes
- 
-             if (!set.isEmpty()) {
-                 // CraftBukkit start - Send scaled max health
-@@ -406,7 +407,7 @@ public class ServerEntity {
-                 this.broadcastAndSend(new ClientboundUpdateAttributesPacket(this.entity.getId(), set));
-             }
- 
--            set.clear();
-+            attributes.clear(); // Plazma - Suppress error from dirty attributes
-         }
- 
-     }
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index cb21da3cff4dbb08c7786c09b39e381abdf45c33..dfd408dc42a6000eb5fa56bbdb64f2329e545078 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-@@ -36,6 +36,7 @@ public class LevelConfigurations extends ConfigurationPart {
-         public int sensorTick = DO_OPTIMIZE ? 10 : 1;
- 
-         public boolean ignoreUselessPackets = DO_OPTIMIZE;
-+        public boolean suppressErrorFromDirtyAttributes = false;
- 
-         public Player player;
-         public class Player extends ConfigurationPart {

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

@@ -1,28 +1,28 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Sat, 30 Sep 2023 21:56:32 +0900
+Date: Mon, 4 Dec 2023 23:01:32 +0900
 Subject: [PATCH] Variable entity wakeup duration
 
 
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 82975c1c92c84294740a411b4a351efb8a2e6769..cb21da3cff4dbb08c7786c09b39e381abdf45c33 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-@@ -51,6 +51,20 @@ public class LevelConfigurations extends ConfigurationPart {
+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
+--- 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 {
  
          }
  
 +        public WakeUpDurationVariance wakeUpDurationVariance;
 +        public class WakeUpDurationVariance extends ConfigurationPart {
 +
-+            double defaultValue() {
-+                return DO_OPTIMIZE ? 0.2 : 0.0;
++            private double defaultValue() {
++                return OPTIMIZE ? 0.2 : 0.0;
 +            }
 +
-+            double animal = defaultValue(); public double animal() { return Math.max(0, this.animal); }
-+            double monster = defaultValue(); public double monster() { return Math.max(0, this.monster); }
-+            double flyingMonster = defaultValue(); public double flyingMonster() { return Math.max(0, this.flyingMonster); }
-+            double villager = defaultValue(); public double villager() { return Math.max(0, this.villager); }
++            double animal = defaultValue(); public double animal() { return Math.max(this.animal, 0.0); }
++            double monster = defaultValue(); public double monster() { return Math.max(this.monster, 0.0); }
++            double flying = defaultValue(); public double flying() { return Math.max(this.flying, 0.0); }
++            double villager = defaultValue(); public double villager() { return Math.max(this.villager, 0.0); }
 +
 +        }
 +
@@ -30,47 +30,47 @@ index 82975c1c92c84294740a411b4a351efb8a2e6769..cb21da3cff4dbb08c7786c09b39e381a
  
      public Structure structure;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 062a793a134f774ebf918aab10443527c06c4fd1..3a362fef29c6fa29c37eff539e343eb3a56bf122 100644
+index 2e9aed328e576abbe216fdb2071c13421e6645b8..cb6ad8ffef606a4074fa2ef4a5f92438124e8f11 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -68,6 +68,13 @@ public class ActivationRange
+@@ -68,29 +68,36 @@ public class ActivationRange
          Activity.PANIC
      };
  
 +    // Plazma start - Variable entity wakeup duration
-+    private static final java.util.Random WAKEUP_DURATION_RANDOM = org.plazmamc.plazma.PlazmaOptions.useJavaRandom() ? new java.util.Random() : new org.plazmamc.plazma.Random();
-+    private static int getWakeupDurationWithVariance(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 * WAKEUP_DURATION_RANDOM.nextGaussian(1, deviation))));
++        return (int) Math.min(Integer.MAX_VALUE, Math.max(1, Math.round(duration * (1 + deviation * random.nextGaussian()))));
 +    }
-+    // Plazma end
++    // Plazma end - Variable entity wakeup duration
      private static int checkInactiveWakeup(Entity entity) {
          Level world = entity.level();
          SpigotWorldConfig config = world.spigotConfig;
-@@ -75,22 +82,22 @@ public class ActivationRange
++        org.plazmamc.plazma.configurations.WorldConfigurations plazmaConfig = world.plazmaConfig(); // Plazma - Variable entity wakeup duration
+         long inactiveFor = MinecraftServer.currentTick - entity.activatedTick;
          if (entity.activationType == ActivationType.VILLAGER) {
              if (inactiveFor > config.wakeUpInactiveVillagersEvery && world.wakeupInactiveRemainingVillagers > 0) {
                  world.wakeupInactiveRemainingVillagers--;
 -                return config.wakeUpInactiveVillagersFor;
-+                return getWakeupDurationWithVariance(config.wakeUpInactiveVillagersFor, world.plazmaLevelConfiguration().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 getWakeupDurationWithVariance(config.wakeUpInactiveAnimalsFor, world.plazmaLevelConfiguration().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 getWakeupDurationWithVariance(config.wakeUpInactiveFlyingFor, world.plazmaLevelConfiguration().entity.wakeUpDurationVariance.flyingMonster()); // 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 getWakeupDurationWithVariance(config.wakeUpInactiveMonstersFor, world.plazmaLevelConfiguration().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/0031-Optimise-state-lookup-more.patch

@@ -1,59 +1,57 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Sat, 30 Sep 2023 22:02:58 +0900
+Date: Mon, 4 Dec 2023 23:12:47 +0900
 Subject: [PATCH] Optimise state lookup more
 
 
 diff --git a/src/main/java/io/papermc/paper/util/table/ZeroCollidingReferenceStateTable.java b/src/main/java/io/papermc/paper/util/table/ZeroCollidingReferenceStateTable.java
-index 57d0cd3ad6f972e986c72a57f1a6e36003f190c2..0832e4fa92b6464a6206475fbceb3b36462757b3 100644
+index 57d0cd3ad6f972e986c72a57f1a6e36003f190c2..50d97c5ab33f33b81dbafd7cf42da5afd9856eeb 100644
 --- a/src/main/java/io/papermc/paper/util/table/ZeroCollidingReferenceStateTable.java
 +++ b/src/main/java/io/papermc/paper/util/table/ZeroCollidingReferenceStateTable.java
 @@ -17,6 +17,7 @@ public final class ZeroCollidingReferenceStateTable {
      protected final StateHolder<?, ?> this_state;
  
      protected long[] index_table;
-+    public long[] index_table() { return this.index_table; } // Plazma - getter
++    public long[] index_table() { return this.index_table; } // Plazma - Getter
      protected StateHolder<?, ?>[][] value_table;
  
      public ZeroCollidingReferenceStateTable(final StateHolder<?, ?> state, final Map<Property<?>, Comparable<?>> this_map) {
 diff --git a/src/main/java/net/minecraft/world/level/block/state/StateHolder.java b/src/main/java/net/minecraft/world/level/block/state/StateHolder.java
-index 5f285d190186a2ff5a61d05070593e1d633dd79a..7b61a956892e90c7556db46d9277da8d252547cd 100644
+index 5f285d190186a2ff5a61d05070593e1d633dd79a..bcb0ba74f4162437d43199d365ff468222f59985 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/StateHolder.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/StateHolder.java
-@@ -114,21 +114,15 @@ public abstract class StateHolder<O, S> {
+@@ -114,6 +114,12 @@ public abstract class StateHolder<O, S> {
      }
  
      public <T extends Comparable<T>, V extends T> S trySetValue(Property<T> property, V value) {
--        Comparable<?> comparable = this.values.get(property);
--        if (comparable != null && !comparable.equals(value)) {
--            S object = this.neighbours.get(property, value);
--            if (object == null) {
--                throw new IllegalArgumentException("Cannot set property " + property + " to " + value + " on " + this.owner + ", it is not an allowed value");
--            } else {
--                return object;
--            }
--        } else {
--            return (S)this;
--        }
-+        // Plazma start - optimise state lookup more
++        // Plazma start - Optimise state lookup more
 +        final S ret = (S) this.optimisedTable.get(property, value);
 +        if (ret == null) throw new IllegalArgumentException("Cannot set property " + property + " to " + value + " on " + this.owner + ", it is not an allowed value");
 +        return ret;
-+        // Plazma end
++        /*
++        // Plazma end - Optimise state lookup more
+         Comparable<?> comparable = this.values.get(property);
+         if (comparable != null && !comparable.equals(value)) {
+             S object = this.neighbours.get(property, value);
+@@ -125,10 +131,11 @@ public abstract class StateHolder<O, S> {
+         } else {
+             return (S)this;
+         }
++         */ // Plazma - Optimise state lookup more
      }
  
      public void populateNeighbours(Map<Map<Property<?>, Comparable<?>>, S> states) {
 -        if (this.neighbours != null) {
-+        if (this.optimisedTable.index_table() != null) { // Plazma - optimise state lookup more
++        if (this.optimisedTable.index_table() != null) { // Plazma - optimise state lookup
              throw new IllegalStateException();
          } else {
              Table<Property<?>, Comparable<?>, S> table = HashBasedTable.create();
-@@ -143,7 +137,7 @@ public abstract class StateHolder<O, S> {
+@@ -143,7 +150,7 @@ public abstract class StateHolder<O, S> {
                  }
              }
  
 -            this.neighbours = (Table<Property<?>, Comparable<?>, S>)(table.isEmpty() ? table : ArrayTable.create(table)); this.optimisedTable.loadInTable((Table)this.neighbours, this.values); // Paper - optimise state lookup
-+            this.optimisedTable.loadInTable((Table) (table.isEmpty() ? table : ArrayTable.create(table)), this.values); // Paper - optimise state lookup // Plazma - more
++            this.optimisedTable.loadInTable((Table) (table.isEmpty() ? table : ArrayTable.create(table)), this.values); // Plazma - Optimize state lookup more
          }
      }
  

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

@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Mon, 4 Dec 2023 23:15:43 +0900
+Subject: [PATCH] Suppress errors from dirty attributes
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
+index 433e9a06db191f8a0ff6c23d1ac6122606e67959..149ea6b62c88200ecfc50c825a1dcdffa56d9fcb 100644
+--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
++++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
+@@ -404,7 +404,8 @@ public class ServerEntity {
+         }
+ 
+         if (this.entity instanceof LivingEntity) {
+-            Set<AttributeInstance> set = ((LivingEntity) this.entity).getAttributes().getDirtyAttributes();
++            Set<AttributeInstance> attributes = ((LivingEntity) this.entity).getAttributes().getDirtyAttributes(); // Plazma - Suppress errors from dirty attributes
++            final Set<AttributeInstance> set = this.level.plazmaConfig().entity.suppressErrorsFromDirtyAttributes ? Collections.synchronizedSet(attributes) : attributes; // Plazma - Suppress errors from dirty attributes
+ 
+             if (!set.isEmpty()) {
+                 // CraftBukkit start - Send scaled max health
+@@ -415,7 +416,7 @@ public class ServerEntity {
+                 this.broadcastAndSend(new ClientboundUpdateAttributesPacket(this.entity.getId(), set));
+             }
+ 
+-            set.clear();
++            attributes.clear(); // Plazma - Suppress errors from dirty attributes
+         }
+ 
+     }
+diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
+index 459cba838468b95547b2a515c497fcbb7bd45718..b1293935e55fcb1c45224e5bda9be8d1045ff4e8 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
+@@ -31,6 +31,7 @@ public class WorldConfigurations extends ConfigurationPart {
+ 
+         public boolean ignoreUselessPackets = OPTIMIZE;
+         public int sensorTick = 1;
++        public boolean suppressErrorsFromDirtyAttributes = OPTIMIZE;
+ 
+         public Phantom phantom;
+         public class Phantom extends ConfigurationPart {

patches/server/0033-Skip-event-if-no-listeners.patch

@@ -1,29 +1,19 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Sat, 30 Sep 2023 22:10:59 +0900
+Date: Mon, 4 Dec 2023 23:17:15 +0900
 Subject: [PATCH] Skip event if no listeners
 
 
 diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
-index 7ce9ebba8ce304d1f3f21d4f15ee5f3560d7700b..6016c304ddbeb6ffbd591f30914c85fcb6371e80 100644
+index 7ce9ebba8ce304d1f3f21d4f15ee5f3560d7700b..23594fb7eb4b2f33146592866608c2858ef23937 100644
 --- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
 +++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
-@@ -26,7 +26,7 @@ import java.util.Map;
- import java.util.Set;
- import java.util.logging.Level;
- 
--class PaperEventManager {
-+public class PaperEventManager { // Plazma - package -> public
- 
-     private final Server server;
- 
-@@ -36,15 +36,17 @@ class PaperEventManager {
+@@ -36,15 +36,16 @@ class PaperEventManager {
  
      // SimplePluginManager
      public void callEvent(@NotNull Event event) {
 +        // Plazma start - Skip event if no listeners
-+        HandlerList handlers = event.getHandlers();
-+        RegisteredListener[] listeners = handlers.getRegisteredListeners();
++        RegisteredListener[] listeners = event.getHandlers().getRegisteredListeners();
 +        if (listeners.length == 0) return;
 +        // Plazma end
          if (event.isAsynchronous() && this.server.isPrimaryThread()) {
@@ -38,15 +28,3 @@ index 7ce9ebba8ce304d1f3f21d4f15ee5f3560d7700b..6016c304ddbeb6ffbd591f30914c85fc
          for (RegisteredListener registration : listeners) {
              if (!registration.getPlugin().isEnabled()) {
                  continue;
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index d17df5621717b1c8d1d9a5549feb73c3600ecf3d..ddbc37857bd2706844074925bc27b7a84efa5832 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -31,7 +31,6 @@ public class GlobalConfiguration extends ConfigurationPart {
-         @Override
-         public void postProcess() {
- 
--
-         }
- 
-         public boolean reduceCreateRandomInstance = DO_OPTIMIZE;

patches/server/0034-Optimize-spigot-event-bus.patch

@@ -1,27 +1,33 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Sat, 30 Sep 2023 22:17:02 +0900
-Subject: [PATCH] Optimize Spigot event bus
+Date: Mon, 4 Dec 2023 23:19:46 +0900
+Subject: [PATCH] Optimize spigot event bus
 
 
 diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
-index 6016c304ddbeb6ffbd591f30914c85fcb6371e80..482e2cdbd4f76f2a56c62bec12bfc39d7193b6ce 100644
+index 23594fb7eb4b2f33146592866608c2858ef23937..94eecf374f1e6b00556a380fd28376f720d61e8e 100644
 --- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
 +++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
-@@ -41,11 +41,14 @@ public class PaperEventManager { // Plazma - package -> public
-         RegisteredListener[] listeners = handlers.getRegisteredListeners();
+@@ -39,12 +39,19 @@ class PaperEventManager {
+         // Plazma start - Skip event if no listeners
+         RegisteredListener[] listeners = event.getHandlers().getRegisteredListeners();
          if (listeners.length == 0) return;
-         // Plazma end
+-        // Plazma end
 -        if (event.isAsynchronous() && this.server.isPrimaryThread()) {
 -            throw new IllegalStateException(event.getEventName() + " may only be triggered asynchronously.");
 -        } else if (!event.isAsynchronous() && !this.server.isPrimaryThread() && !this.server.isStopping()) {
 -            throw new IllegalStateException(event.getEventName() + " may only be triggered synchronously.");
-+        // Plazma start - Optimize Spigot event bus
-+        if (event.asynchronous() != net.kyori.adventure.util.TriState.NOT_SET) {
-+            final boolean async = event.isAsynchronous();
-+            final boolean primary = this.server.isPrimaryThread();
-+            if (async && primary) throw new IllegalStateException(event.getEventName() + " may only be triggered asynchronously.");
-+            if (!async && !primary && !this.server.isStopping()) throw new IllegalStateException(event.getEventName() + " may only be triggered synchronously.");
++
++        // Optimize Spigot event bus
++        if (event.asynchronous() == net.kyori.adventure.util.TriState.NOT_SET) {
++            boolean async = event.isAsynchronous();
++            boolean primary = this.server.isPrimaryThread();
++
++            if (async && primary)
++                throw new IllegalStateException(event.getEventName() + " may only be triggered asynchronously.");
++
++            if (!async && !primary && !this.server.isStopping())
++                throw new IllegalStateException(event.getEventName() + " may only be triggered synchronously.");
          }
 +        // Plazma end
  

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

@@ -0,0 +1,80 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Tue, 5 Dec 2023 13:29:28 +0900
+Subject: [PATCH] Add entity spawn deadlock timer
+
+[REFERENCE]
+- 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
+--- 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 {
+     public int requiredPlayerRange = 16;
+     public int spawnRange = 4;
+     private int tickDelay = 0; // Paper - Configurable mob spawner tick rate
++    private int blockExistsTick = 0; // Plazma - Add entity spawn deadlock timer
++    private boolean blockLockedByTime = false; // Plazma - Add entity spawn deadlock timer
+ 
+     public BaseSpawner() {}
+ 
+@@ -83,6 +85,17 @@ public abstract class BaseSpawner {
+     }
+ 
+     public void serverTick(ServerLevel world, BlockPos pos) {
++        // Plazma start - Add entity spawn deadlock timer
++        if (world.plazmaConfig().entity.spawnDeadlockTimer.enabled) {
++            if (!this.blockLockedByTime) {
++                if (this.blockExistsTick > world.plazmaConfig().entity.spawnDeadlockTimer.timerTimeout)
++                    blockLockedByTime = true;
++                else blockExistsTick++;
++            }
++
++            if (blockLockedByTime && world.getBestNeighborSignal(pos) > 0) return;
++        }
++        // Plazma end - Add entity spawn deadlock timer
+         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 {
+         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 {
+             }));
+         }
+ 
++        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());
+         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
+--- 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 {
+ 
+         }
+ 
++        public SpawnDeadlockTimer spawnDeadlockTimer;
++        public class SpawnDeadlockTimer extends ConfigurationPart {
++
++            public boolean enabled = OPTIMIZE;
++            public int timerTimeout = 0;
++
++        }
++
+     }
+ 
+     public Structure structure;

patches/server/0037-Lithium-HashedList.patch

@@ -0,0 +1,306 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Wed, 10 Jan 2024 18:08:59 +0900
+Subject: [PATCH] Lithium - HashedList
+
+
+diff --git a/src/main/java/me/jellysquid/mods/lithium/common/util/collections/HashedReferenceList.java b/src/main/java/me/jellysquid/mods/lithium/common/util/collections/HashedReferenceList.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..d11579075e653868a43fe826bdf9b41ddc031b85
+--- /dev/null
++++ b/src/main/java/me/jellysquid/mods/lithium/common/util/collections/HashedReferenceList.java
+@@ -0,0 +1,277 @@
++package me.jellysquid.mods.lithium.common.util.collections;
++
++import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap;
++import it.unimi.dsi.fastutil.objects.ReferenceArrayList;
++import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
++import org.jetbrains.annotations.NotNull;
++
++import java.util.*;
++
++/**
++ * Wraps a {@link List} with a hash table which provides O(1) lookups for {@link Collection#contains(Object)}. The type
++ * contained by this list must use reference-equality semantics.
++ */
++@SuppressWarnings("SuspiciousMethodCalls")
++public class HashedReferenceList<T> implements List<T> {
++    private final ReferenceArrayList<T> list;
++    private final Reference2IntOpenHashMap<T> counter;
++
++    public HashedReferenceList(List<T> list) {
++        this.list = new ReferenceArrayList<>();
++        this.list.addAll(list);
++
++        this.counter = new Reference2IntOpenHashMap<>();
++        this.counter.defaultReturnValue(0);
++
++        for (T obj : this.list) {
++            this.counter.addTo(obj, 1);
++        }
++    }
++
++    @Override
++    public int size() {
++        return this.list.size();
++    }
++
++    @Override
++    public boolean isEmpty() {
++        return this.list.isEmpty();
++    }
++
++    @Override
++    public boolean contains(Object o) {
++        return this.counter.containsKey(o);
++    }
++
++    @Override
++    public @NotNull Iterator<T> iterator() {
++        return this.listIterator();
++    }
++
++    @Override
++    public Object @NotNull [] toArray() {
++        return this.list.toArray();
++    }
++
++    @Override
++    public <T1> T1 @NotNull [] toArray(T1 @NotNull [] a) {
++        return this.list.toArray(a);
++    }
++
++    @Override
++    public boolean add(T t) {
++        this.trackReferenceAdded(t);
++
++        return this.list.add(t);
++    }
++
++    @Override
++    public boolean remove(Object o) {
++        this.trackReferenceRemoved(o);
++
++        return this.list.remove(o);
++    }
++
++    @Override
++    public boolean containsAll(Collection<?> c) {
++        for (Object obj : c) {
++            if (!this.counter.containsKey(obj)) {
++                return false;
++            }
++        }
++
++        return true;
++    }
++
++    @Override
++    public boolean addAll(Collection<? extends T> c) {
++        for (T obj : c) {
++            this.trackReferenceAdded(obj);
++        }
++
++        return this.list.addAll(c);
++    }
++
++    @Override
++    public boolean addAll(int index, Collection<? extends T> c) {
++        for (T obj : c) {
++            this.trackReferenceAdded(obj);
++        }
++
++        return this.list.addAll(index, c);
++    }
++
++    @Override
++    public boolean removeAll(@NotNull Collection<?> c) {
++        if (this.size() >= 2 && c.size() > 4 && c instanceof List) {
++            //HashReferenceList uses reference equality, so using ReferenceOpenHashSet is fine
++            c = new ReferenceOpenHashSet<>(c);
++        }
++        this.counter.keySet().removeAll(c);
++        return this.list.removeAll(c);
++    }
++
++    @Override
++    public boolean retainAll(@NotNull Collection<?> c) {
++        this.counter.keySet().retainAll(c);
++        return this.list.retainAll(c);
++    }
++
++    @Override
++    public void clear() {
++        this.counter.clear();
++        this.list.clear();
++    }
++
++    @Override
++    public T get(int index) {
++        return this.list.get(index);
++    }
++
++    @Override
++    public T set(int index, T element) {
++        T prev = this.list.set(index, element);
++
++        if (prev != element) {
++            if (prev != null) {
++                this.trackReferenceRemoved(prev);
++            }
++
++            this.trackReferenceAdded(element);
++        }
++
++        return prev;
++    }
++
++    @Override
++    public void add(int index, T element) {
++        this.trackReferenceAdded(element);
++
++        this.list.add(index, element);
++    }
++
++    @Override
++    public T remove(int index) {
++        T prev = this.list.remove(index);
++
++        if (prev != null) {
++            this.trackReferenceRemoved(prev);
++        }
++
++        return prev;
++    }
++
++    @Override
++    public int indexOf(Object o) {
++        return this.list.indexOf(o);
++    }
++
++    @Override
++    public int lastIndexOf(Object o) {
++        return this.list.lastIndexOf(o);
++    }
++
++    @Override
++    public @NotNull ListIterator<T> listIterator() {
++        return this.listIterator(0);
++    }
++
++    @Override
++    public @NotNull ListIterator<T> listIterator(int index) {
++        return new ListIterator<>() {
++            private final ListIterator<T> inner = HashedReferenceList.this.list.listIterator(index);
++
++            @Override
++            public boolean hasNext() {
++                return this.inner.hasNext();
++            }
++
++            @Override
++            public T next() {
++                return this.inner.next();
++            }
++
++            @Override
++            public boolean hasPrevious() {
++                return this.inner.hasPrevious();
++            }
++
++            @Override
++            public T previous() {
++                return this.inner.previous();
++            }
++
++            @Override
++            public int nextIndex() {
++                return this.inner.nextIndex();
++            }
++
++            @Override
++            public int previousIndex() {
++                return this.inner.previousIndex();
++            }
++
++            @Override
++            public void remove() {
++                int last = this.previousIndex();
++
++                if (last == -1) {
++                    throw new NoSuchElementException();
++                }
++
++                T prev = HashedReferenceList.this.get(last);
++
++                if (prev != null) {
++                    HashedReferenceList.this.trackReferenceRemoved(prev);
++                }
++
++                this.inner.remove();
++            }
++
++            @Override
++            public void set(T t) {
++                int last = this.previousIndex();
++
++                if (last == -1) {
++                    throw new NoSuchElementException();
++                }
++
++                T prev = HashedReferenceList.this.get(last);
++
++                if (prev != t) {
++                    if (prev != null) {
++                        HashedReferenceList.this.trackReferenceRemoved(prev);
++                    }
++
++                    HashedReferenceList.this.trackReferenceAdded(t);
++                }
++
++                this.inner.remove();
++            }
++
++            @Override
++            public void add(T t) {
++                HashedReferenceList.this.trackReferenceAdded(t);
++
++                this.inner.add(t);
++            }
++        };
++    }
++
++    @Override
++    public @NotNull List<T> subList(int fromIndex, int toIndex) {
++        return this.list.subList(fromIndex, toIndex);
++    }
++
++    private void trackReferenceAdded(T t) {
++        this.counter.addTo(t, 1);
++    }
++
++    @SuppressWarnings("unchecked")
++    private void trackReferenceRemoved(Object o) {
++        if (this.counter.addTo((T) o, -1) <= 1) {
++            this.counter.removeInt(o);
++        }
++    }
++
++}
+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
+--- 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;
+ 
+ public class WeightedRandomList<E extends WeightedEntry> {
+     private final int totalWeight;
+-    private final ImmutableList<E> items;
++    private final List<E> items; // Plazma - Lithium: collections.mob_spawning
+ 
+     WeightedRandomList(List<? extends E> entries) {
+-        this.items = ImmutableList.copyOf(entries);
++        this.items = entries.size() > 4 ? ImmutableList.copyOf(entries) : java.util.Collections.unmodifiableList(new me.jellysquid.mods.lithium.common.util.collections.HashedReferenceList<>(entries)); // Plazma - Lithium: collections.mob_spawning
+         this.totalWeight = WeightedRandom.getTotalWeight(entries);
+     }
+ 

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

@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Wed, 10 Jan 2024 18:11:03 +0900
+Subject: [PATCH] Improve SwingTime ticking
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+index bfa69b2c37f07132f8b31c12d26f4ceb074901a5..61cf0db77966e35da9ca30718b7e667f4c8a9297 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 {
+     }
+ 
+     protected void updateSwingTime() {
++        if (!this.swinging && this.swingTime == 0) return; // Plazma - Improve SwingTime ticking
+         int i = this.getCurrentSwingDuration();
+ 
+         if (this.swinging) {

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

@@ -0,0 +1,116 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Thu, 11 Jan 2024 13:40:41 +0900
+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
+--- 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 {
+     }
+ 
+     private void saveIpBanList() {
+-        try {
++        //try { // Plazma - Save Json list asynchronously
+             this.getIpBans().save();
+-        } catch (IOException var2) {
++        /*} catch (IOException var2) { // Plazma - Save Json list asynchronously
+             LOGGER.warn("Failed to save ip banlist: ", (Throwable)var2);
+-        }
++        }*/ // Plazma - Save Json list asynchronously
+ 
+     }
+ 
+     private void saveUserBanList() {
+-        try {
++        //try { // Plazma - Save Json list asynchronously
+             this.getBans().save();
+-        } catch (IOException var2) {
++        /*} catch (IOException var2) { // Plazma - Save Json list asynchronously
+             LOGGER.warn("Failed to save user banlist: ", (Throwable)var2);
+-        }
++        }*/ // Plazma - Save Json list asynchronously
+ 
+     }
+ 
+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
+--- 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>> {
+     public void add(V entry) {
+         this.map.put(this.getKeyForUser(entry.getUser()), entry);
+ 
+-        try {
++        //try { // Plazma - Save Json list asynchronously
+             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);
+-        }
++        }*/ // Plazma - Save Json list asynchronously
+ 
+     }
+ 
+@@ -63,11 +63,11 @@ 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();
+-        } catch (IOException ioexception) {
++        /*} catch (IOException ioexception) { // Plazma - Save Json list asynchronously
+             StoredUserList.LOGGER.warn("Could not save the list after removing a user.", ioexception);
+-        }
++        }*/ // Plazma - Save Json list asynchronously
+ 
+     }
+ 
+@@ -102,7 +102,10 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+         return this.map.values();
+     }
+ 
+-    public void save() throws IOException {
++    // 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>> {
+ 
+         Objects.requireNonNull(jsonarray);
+         stream.forEach(jsonarray::add);
+-        BufferedWriter bufferedwriter = Files.newWriter(this.file, StandardCharsets.UTF_8);
+ 
+-        try {
++        try (BufferedWriter bufferedwriter = Files.newWriter(this.file, StandardCharsets.UTF_8)) {
+             StoredUserList.GSON.toJson(jsonarray, bufferedwriter);
+-        } catch (Throwable throwable) {
+-            if (bufferedwriter != null) {
+-                try {
+-                    bufferedwriter.close();
+-                } catch (Throwable throwable1) {
+-                    throwable.addSuppressed(throwable1);
+-                }
+-            }
+-
+-            throw throwable;
+-        }
+-
+-        if (bufferedwriter != null) {
+-            bufferedwriter.close();
++        } catch (IOException e) {
++            StoredUserList.LOGGER.warn("Failed to asynchronously save file " + this.file, e);
+         }
+ 
++        });
+     }
++    // Plazma end - Save Json list asynchronously
+ 
+     public void load() throws IOException {
+         if (this.file.exists()) {

patches/unapplied/server/0033-Optimize-VarInts.patch

@@ -1,87 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: IPECTER <ipectert@gmail.com>
-Date: Thu, 4 May 2023 16:54:53 +0900
-Subject: [PATCH] Optimize VarInts
-
-https://github.com/PaperMC/Paper/pull/8418
-
-diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-index c0bd2997fe3ebbfe926de832a36d209cc875f3e2..8bb552410207b39a3b4160a5df51410455107fcf 100644
---- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-+++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-@@ -99,12 +99,26 @@ public class FriendlyByteBuf extends ByteBuf {
-     private static final Gson GSON = new Gson();
- 
-     public static boolean hasItemSerializeEvent = false; // Purpur
-+    public static boolean optimizeVarInts = false; // Plazma
- 
-     public FriendlyByteBuf(ByteBuf parent) {
-         this.source = parent;
-     }
- 
-+    // Plazma start - Optimize VarInts
-+    private static final int[] VARINT_EXACT_BYTE_LENGTHS = new int[33];
-+    static {
-+        for (int i = 0; i <= 32; ++i) {
-+            VARINT_EXACT_BYTE_LENGTHS[i] = (int) Math.ceil((31d - (i - 1)) / 7d);
-+        }
-+        VARINT_EXACT_BYTE_LENGTHS[32] = 1; // Special case for the number 0.
-+    }
-+    // Plazma end
-     public static int getVarIntSize(int value) {
-+        // Plazma start - Optimize VarInts
-+        if (optimizeVarInts)
-+            return VARINT_EXACT_BYTE_LENGTHS[Integer.numberOfLeadingZeros(value)];
-+        // Plazma end
-         for (int j = 1; j < 5; ++j) {
-             if ((value & -1 << j * 7) == 0) {
-                 return j;
-@@ -620,6 +634,25 @@ public class FriendlyByteBuf extends ByteBuf {
-     }
- 
-     public FriendlyByteBuf writeVarInt(int value) {
-+        // Plazma start - Optimize VarInts
-+        if (optimizeVarInts) {
-+            // Peel the one and two byte count cases explicitly as they are the most common VarInt sizes
-+            // that the proxy will write, to improve inlining.
-+            if ((value & (0xFFFFFFFF << 7)) == 0) {
-+                writeByte(value);
-+            } else if ((value & (0xFFFFFFFF << 14)) == 0) {
-+                int w = (value & 0x7F | 0x80) << 8 | (value >>> 7);
-+                writeShort(w);
-+            } else {
-+                while ((value & -128) != 0) {
-+                    this.writeByte(value & 127 | 128);
-+                    value >>>= 7;
-+                }
-+                this.writeByte(value);
-+            }
-+            return this;
-+        }
-+        // Plazma end
-         while ((value & -128) != 0) {
-             this.writeByte(value & 127 | 128);
-             value >>>= 7;
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index b2c9ac1947e6c9ad0e693cfeaf6f2f4bfd521aa0..525fe30b6abba295709fca3d10f9b24679112571 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -38,11 +38,17 @@ public class GlobalConfiguration extends ConfigurationPart {
-     }
- 
-     public Misc misc;
--    public class Misc extends ConfigurationPart {
-+    public class Misc extends ConfigurationPart.Post {
- 
-         public boolean reduceCreateRandomInstance = DO_OPTIMIZE;
-         public boolean doNotTriggerLootTableRefreshForNonPlayerInteraction = DO_OPTIMIZE;
-         public boolean doNotSendUselessEntityPackets = DO_OPTIMIZE;
-+        public boolean optimizeVarInts = DO_OPTIMIZE;
-+
-+        @Override
-+        public void postProcess() {
-+            net.minecraft.network.FriendlyByteBuf.optimizeVarInts = optimizeVarInts;
-+        }
- 
-     }
-