Fix API version

* Fix metrics

* Fix version fetching

.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,107 +0,0 @@
-name: Build Plazma
-
-on:
-  push:
-    branches: [ "ver/*", "feat/*", "dev/*", "expr/*", "ench/*", "impl/*" ]
-  workflow_dispatch:
-
-env:
-  ORG_NAME: PlazmaMC
-  MC_VERSION: 1.19.4
-  MAIN_BRANCH: ver/1.19.4
-  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
-        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)
-        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

.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,19 @@ name: Test Gradle build script
 
 on:
   push:
-    branches: [ "ver/*", "feat/*", "dev/*", "expr/*", "ench/*", "impl/*" ]
+    branches: [ "ver/*", "dev/*", "feat/**/*" ]
+    paths:
+      - "gradle-wrapper.*"
+      - "*.gradle.*"
   workflow_dispatch:
 
 jobs:
-  release:
+  check:
+    name: Test Gradle build script
     strategy:
       matrix:
-        jdk: [19.0.2+7]
+        jdk: [21]
-        java: ['temurin']
+        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.2)
+
+on:
+  push:
+    branches: [ "ver/*", "dev/*", "feat/**/*" ]
+    paths:
+      - "**.patch"
+  workflow_dispatch:
+
+env:
+  ORG_NAME: PlazmaMC
+  MC_VERSION: 1.20.2
+
+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.GITHUB_TOKEN }}
+
+      - 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.GITHUB_TOKEN }}
+
+      - 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

.upstream-data

@@ -1,2 +0,0 @@
-purpurCommit = 561164b800712a7bd02ca0a7069c23bc71677b79
-pufferfishCommit = 845c015664150048d0a7c02b706fe1c05a91ac16

README.md

@@ -1,48 +1,38 @@
 <div align="center">
 
-![image](res/title-400.png)
+[![image](https://raw.githubusercontent.com/PlazmaMC/Plazma/main/src/resources/title-900.png)](https://github.com/PlazmaMC/Plazma)
 
 ### A Server Platform for Minecraft: Java Edition based on [Paper](https://github.com/PaperMC/Paper)
 
-[![WIP](https://img.shields.io/badge/Work%20In%20Progress-red?style=for-the-badge)](README.md)
+[![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.19.4&logo=GoogleAnalytics&style=for-the-badge&logoColor=ffffff)](https://github.com/PlazmaMC/Plazma/actions/workflows/build.yml?query=branch:ver/1.19.4)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/PlazmaMC/Plazma/build.yml?branch=ver/1.20.2&logo=GoogleAnalytics&style=for-the-badge&logoColor=ffffff)](https://github.com/PlazmaMC/Plazma/actions/workflows/build.yml?query=branch:ver/1.20.2)
-[![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.2-6047ff?&logo=Webpack&style=for-the-badge&logoColor=ffffff)](https://github.com/PlazmaMC/Plazma/releases/build/1.20.2/latest)
 
-[![License](https://img.shields.io/github/license/PlazmaMC/Plazma?logo=github&style=for-the-badge&logoColor=ffffff)](LICENSE)
+[![License](https://img.shields.io/github/license/PlazmaMC/Plazma?logo=github&style=flat-square&logoColor=ffffff)](LICENSE)
-[![Discord](https://img.shields.io/discord/1083716853928558652?color=%235865F2&label=Discord&logo=discord&style=for-the-badge&logoColor=ffffff)](https://discord.gg/MmfC52K8A8)
+[![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)
-[![MC Version](https://img.shields.io/badge/MC-1.19.4-6047ff?&logo=Webpack&style=for-the-badge&logoColor=ffffff)](https://github.com/PlazmaMC/Plazma/releases/latest-1.19.4)
-
-[![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.19.4)
 [![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)
 
 </div>
 
-## ⚠️ Warning
+[main]: https://github.com/PlazmaMC/Plazma
-- Plazma may cause **<u>unexpected problems</u>**, so **don't use** it in production server!
 
-## 💬 About Plazma...
+> [!IMPORTANT]
-- **Plazma** is created from the merger of **[Andromeda](https://github.com/TeamEarendel/Andromeda)** and **[Fusion](https://github.com/RuinedTechnologyUnify/Fusion)**
+This is the branch for Plazma 1.20.2. If you want to know more about Plazma, please check the **[main branch][main]**.<br>
-- Compatible and effective patches from other bukkits and mods
+이곳은 플라즈마의 1.20.2용 분기입니다. 플라즈마에 대해 자세히 알고 싶다면 **[main 브랜치][main]** 를 확인해주세요.
-- We're always trying to keep it compatible and performance high.
-
-## ⚙️ Features
-- **Based on [Paper](https://github.com/PaperMC/Paper)** - Most plugins of Bukkit, Craft Bukkit, Spigot, and Paper are available
-- **Including [Pufferfish](https://github.com/pufferfish-gg/Pufferfish) and [Purpur](https://github.com/PurpurMC/Purpur)** - Provides multiple optimizations and customizations
 
 ## ⬇️ Downloads
-- You can download the file from [Releases](https://github.com/PlazmaMC/Plazma/releases)
+> [!NOTE]
-- Direct latest download: [Click here](https://github.com/PlazmaMC/Plazma/releases/download/latest-1.19.4/plazma-paperclip-1.19.4-R0.1-SNAPSHOT-reobf.jar)
+If you don't know about Mojmap or Bundler, download **Reobf Paperclip**<br>
-- NOTE: If you don't know about Mojmap or Bundler, download `plazma-paperclip-*-reobf.jar`
+Mojmap 또는 Bundler에 대해 잘 알지 못한다면, **Reobf Paperclip**을 사용하세요
 
-## ⚖️ License
+<!--- LINKS --->
-- This project and all patches are licensed under the [MIT license](LICENSE.md) unless otherwise noted in the patch headers.
+[paperReobf]: https://github.com/PlazmaMC/Plazma/releases/download/build/1.20.2/latest/plazma-paperclip-1.20.2-R0.1-SNAPSHOT-reobf.jar
+[paperMojmap]: https://github.com/PlazmaMC/Plazma/releases/download/build/1.20.2/latest/plazma-paperclip-1.20.2-R0.1-SNAPSHOT-mojmap.jar
+[bundlerReobf]: https://github.com/PlazmaMC/Plazma/releases/download/build/1.20.2/latest/plazma-bundler-1.20.2-R0.1-SNAPSHOT-reobf.jar
+[bundlerMojmap]: https://github.com/PlazmaMC/Plazma/releases/download/build/1.20.2/latest/plazma-bundler-1.20.2-R0.1-SNAPSHOT-mojmap.jar
 
-## 🌀 Sponsorship - Minecraft Development Dictionary (KOREAN)
+| **Reobf Paperclip (Default)** |    Mojmap Paperclip     |      Reobf Bundler       |      Mojmap Bundler       |
-[![Discord](https://img.shields.io/discord/911980670123905054?color=%239c91fd&label=MDD&logo=discord&style=for-the-badge&logoColor=ffffff)](https://discord.gg/AZwXTA9Pgx) 
+|:-----------------------------:|:-----------------------:|:------------------------:|:-------------------------:|
-- 한글로 번역&정리된 Minecraft와 서드파티 버킷들의 소식들을 빠르게 만나볼 수 있습니다.
+|    [Download][paperReobf]     | [Download][paperMojmap] | [Download][bundlerReobf] | [Download][bundlerMojmap] |
-- Skript와 Plugin등 서버 개발과 관련된 질문에 대한 답변을 받으실 수 있습니다.
-
-## 📈 bStats
-[![](https://bstats.org/signatures/server-implementation/Plazma.svg)](https://bstats.org/plugin/server-implementation/Plazma/18047)

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,11 +1,16 @@
-import io.papermc.paperweight.util.*
 import io.papermc.paperweight.util.constants.PAPERCLIP_CONFIG
 
 plugins {
     java
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "8.1.1" apply false
+    `kotlin-dsl`
-    id("io.papermc.paperweight.patcher") version "1.5.5"
+    `always-up-to-date`
+    alias(libs.plugins.shadow) apply false
+    alias(libs.plugins.paperweight)
+}
+
+kotlin.jvmToolchain {
+    languageVersion = JavaLanguageVersion.of(17)
 }
 
 repositories {
@@ -18,38 +23,58 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
+    remapper(libs.remapper)
-    decompiler("net.minecraftforge:forgeflower:2.0.627.2")
+    decompiler(libs.decompiler)
-    paperclip("io.papermc:paperclip:3.0.3")
+    paperclip(libs.paperclip)
 }
 
-subprojects {
+allprojects {
     apply(plugin = "java")
+    apply(plugin = "maven-publish")
 
-    java {
+    java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
-        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 {
+    apply(plugin = "java")
-        options.encoding = "UTF-8"
+    
-        options.release.set(17)
+    tasks {
-    }
+        withType<JavaCompile>().configureEach {
-
+            options.compilerArgs.addAll(listOf("--add-modules=jdk.incubator.vector", "-Xmaxwarns", "1"))
-    tasks.withType<Javadoc> {
+            options.encoding = Charsets.UTF_8.name()
-        options.encoding = Charsets.UTF_8.name()
+            options.release.set(17)
-    }
+        }
-
+    
-    tasks.withType<ProcessResources> {
+        withType<Javadoc> {
-        filteringCharset = Charsets.UTF_8.name()
+            options.encoding = Charsets.UTF_8.name()
-    }
+        }
-
+    
-    tasks.withType<Test> {
+        withType<ProcessResources> {
-        minHeapSize = "2g"
+            filteringCharset = Charsets.UTF_8.name()
-        maxHeapSize = "2g"
+        }
+    
+        withType<Test> {
+            minHeapSize = "2g"
+            maxHeapSize = "2g"
+        }
     }
 
     repositories {
@@ -83,28 +108,22 @@ paperweight {
     }
 }
 
-val upstreamTask = tasks.register("updateUpstream") {
+alwaysUpToDate {
-    val tempDir = layout.cacheDir("updateUpstream");
+    paperRepository.set("https://github.com/PaperMC/Paper")
-    val file = "gradle.properties";
+    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")
+}
 
-    doFirst {
+tasks {
-        val apiResponse = layout.cache.resolve("apiResponse.json");
+    generateDevelopmentBundle {
-        download.get().download("https://api.github.com/repos/PaperMC/Paper/commits/master", apiResponse);
+        apiCoordinates.set("org.plazmamc.plazma:plazma-api")
-        val latestCommit = gson.fromJson<paper.libs.com.google.gson.JsonObject>(apiResponse)["sha"].asString;
+        mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi")
-
+        libraryRepositories.addAll(
-        copy {
+                "https://repo.maven.apache.org/maven2/",
-            from(file)
+                "https://papermc.io/repo/repository/maven-public/"
-            into(tempDir)
+        )
-            filter { line: String ->
-                line.replace("paperCommit = .*".toRegex(), "paperCommit = $latestCommit")
-            }
-        }
-    }
-
-    doLast {
-        copy {
-            from(tempDir.file("gradle.properties"))
-            into(project.file(file).parent)
-        }
     }
 }

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,15 @@
+package org.plazmamc.alwaysuptodate
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.plazmamc.alwaysuptodate.tasks.*
+
+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)
+    }
+
+}

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/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 org.plazmamc.alwaysuptodate.utils.pathIO
+import java.io.File
+
+abstract class PaperUpdateTask : Task() {
+
+    private val property = project.extensions["alwaysUpToDate"] as AlwaysUpToDateExtension
+    private val regex = "[a-z0-9]{40}\trefs/heads/${property.paperBranch}".toRegex()
+    private val git = Git(project.pathIO)
+
+    override fun init() {
+        outputs.upToDateWhen { check() }
+    }
+
+    private fun check(): Boolean {
+        val latestCommit = git("ls-remote", property.paperRepository.get()).readText()?.lines()
+            ?.filterNot { regex.matches(it) }?.first()?.split("\t")?.first()
+            ?: throw AlwaysUpToDateException("Failed to get latest Paper commit")
+        val currentCommit = project.properties["paperCommit"] as String
+
+        return currentCommit == latestCommit
+    }
+
+    @TaskAction
+    fun update() {
+        if (check()) return
+        updatePaperCommit(property.paperRepository.get(), property.paperBranch.get(), project.file("gradle.properties"))
+    }
+
+}
+
+fun updatePaperCommit(repo: String, branch: String, properties: File) {
+    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("paperCommit = .*".toRegex(), "paperCommit = $latestCommit"))
+}

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

@@ -0,0 +1,169 @@
+package org.plazmamc.alwaysuptodate.tasks
+
+import io.papermc.paperweight.util.*
+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 org.plazmamc.alwaysuptodate.utils.pathIO
+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 { check() }
+    }
+
+    private fun check(): Boolean {
+        val regex = "[a-z0-9]{40}\trefs/heads/${property.purpurBranch}".toRegex()
+        val latestCommit = Git(project.pathIO)("ls-remote", property.purpurRepository.get()).readText()?.lines()
+            ?.filterNot { regex.matches(it) }?.first()?.split("\t")?.first()
+            ?: throw AlwaysUpToDateException("Failed to get latest Purpur commit")
+        val currentCommit = project.properties["purpurCommit"] as String
+
+        return currentCommit == latestCommit
+    }
+
+    @TaskAction
+    fun update() {
+        if (check()) return
+        Git.checkForGit()
+
+        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())
+        updatePaperCommit(property.paperRepository.get(), property.paperBranch.get(), purpur.resolve("gradle.properties").toFile())
+        updatePaperCommit(property.paperRepository.get(), property.paperBranch.get(), project.file("gradle.properties"))
+
+        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")
+            }
+        }
+    }
+
+    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)
+        }
+    }
+
+    abstract class PurpurBuildTask : Task() {
+
+        private val property = project.extensions["alwaysUpToDate"] as AlwaysUpToDateExtension
+
+        @TaskAction
+        fun build() {
+
+        }
+
+    }
+
+}

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,11 @@
+version = 1.20.2-R0.1-SNAPSHOT
+mcVersion = 1.20.2
+
+paperCommit = 931781c220b98dde0159c9a3c8dce06c3b2b1e13
+purpurCommit = c46cb7ef66675e00a48e20c40febed7ff914f35d
+pufferfishCommit = bc89152d4cd4bb0f9644da2fe10774df4cc25661
+
 group = org.plazmamc.plazma
-version = 1.19.4-R0.1-SNAPSHOT
-
-paperCommit = d8d3bd70b03f47f081d19860391e4c8b0963a5ef
-
 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.10"
+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.1.1-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;
+# Collect all arguments for the java command:
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     shell script including quotes and variable substitutions, so put them in
+#     and any embedded shellness will be escaped.
-#     double quotes to make sure that they get re-expanded; and
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#   * put everything else in single quotes, so that it's not re-expanded.
+#     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 = "1.8.0-beta4"
+bungeechat = "1.20-R0.1-deprecated+build.14"
+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.14.0"
+commons-lang2 = "2.6"
+commons-lang3 = "3.12.0"
+maven-provider = "3.8.5"
+maven-resolver = "1.7.3"
+
+[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" ]
+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,35 @@
+[versions]
+ansi = "1.0.3"
+jansi = "3.21.0"
+rhino = "1.7.14"
+mysql = "8.1.0"
+sqlite = "3.42.0.1"
+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" }
+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" ]

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

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
+From: Kevin Raneri <kevin.raneri@gmail.com>
-Date: Sun, 4 Jun 2023 07:49:45 +0000
+Date: Sun, 26 Nov 2023 23:32:01 +0000
 Subject: [PATCH] Pufferfish API Changes
 
 Original: Kevin Raneri <kevin.raneri@gmail.com>
@@ -20,18 +20,18 @@ 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 279a666e8ea2c07f41ee3f28b768e95dca5f0a10..a93b900889ddb56a2943c54a7fff6f60f42a78f1 100644
+index e827ee211e3c65dc68ac5867fd8476639df63645..b9c75a190dbd7a90ac5ef0fbc6e6fe34806acc4e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -42,6 +42,7 @@ dependencies {
+@@ -47,6 +47,7 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-logger-slf4j")
-     api("org.apache.logging.log4j:log4j-api:2.17.1")
+     api("org.apache.logging.log4j:log4j-api:$log4jVersion")
-     api("org.slf4j:slf4j-api:1.8.0-beta4")
+     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")
-@@ -85,6 +86,13 @@ val generateApiVersioningFile by tasks.registering {
+@@ -106,6 +107,13 @@ val generateApiVersioningFile by tasks.registering {
      }
  }
  
@@ -389,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 @@
@@ -480,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 f9b57b872780aa6b9b959494874b57c7a8ff0c53..90953bfc81168068a281be4d2d3942d5e7dd69ff 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
  
@@ -492,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);
      }
  
@@ -500,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);
  
@@ -509,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
          }
  
@@ -517,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,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
+From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 4 Jun 2023 07:52:25 +0000
+Date: Sun, 26 Nov 2023 23:37:25 +0000
 Subject: [PATCH] Purpur API Changes
 
 Original: PurpurMC
@@ -25,10 +25,10 @@ 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 a93b900889ddb56a2943c54a7fff6f60f42a78f1..417c4324af22c870de669e338a1eee5d540184a4 100644
+index b9c75a190dbd7a90ac5ef0fbc6e6fe34806acc4e..41d7b75e904b94073dfcd12b776a7759a963b66f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -105,6 +105,8 @@ tasks.jar {
+@@ -126,6 +126,8 @@ tasks.jar {
  }
  
  tasks.withType<Javadoc> {
@@ -169,10 +169,10 @@ index e801e79fa57c44b2e5d359647c920f88064826f1..1abfcee0f6d632f4cd8d74b4994a90c9
                  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 998f629852e1103767e005405d1f39c2251ecd28..3c05b03bb5ff3bfec6c69a5cc4b23f0633ab473f 100644
+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
-@@ -200,6 +200,18 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+@@ -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"));
  
@@ -189,7 +189,7 @@ index 998f629852e1103767e005405d1f39c2251ecd28..3c05b03bb5ff3bfec6c69a5cc4b23f06
 +    // Purpur end
 +
      /**
-      * @deprecated removed in 1.16
+      * @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
@@ -209,10 +209,10 @@ index a736d7bcdc5861a01b66ba36158db1c716339346..22fc165fd9c95f0f3ae1be7a0857e48c
  
          @Override
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 15a9993c2705e2dcc0366394ded57acffab589c0..74731f0d64d3bfc61baf816516b2bcef6515213e 100644
+index 4863d9f21f0a0f11974be85360edc587ffd7eab3..8ea42a1f07df756bf504609d2bbff578f20bb808 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2460,4 +2460,127 @@ public final class Bukkit {
+@@ -2832,4 +2832,127 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -341,7 +341,7 @@ index 15a9993c2705e2dcc0366394ded57acffab589c0..74731f0d64d3bfc61baf816516b2bcef
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
-index ea4ceb643239c26851bacbf45fc3f2efef3bb4be..3b8395dcb73e3fb251adf7438cbc7e95c4185a3a 100644
+index 918a045165cdcde264bc24082b7afebb407271de..687d11619379aead7f665d4a5f8f8bcc857cb8e9 100644
 --- a/src/main/java/org/bukkit/ChatColor.java
 +++ b/src/main/java/org/bukkit/ChatColor.java
 @@ -3,6 +3,7 @@ package org.bukkit;
@@ -352,7 +352,7 @@ index ea4ceb643239c26851bacbf45fc3f2efef3bb4be..3b8395dcb73e3fb251adf7438cbc7e95
  import java.util.regex.Pattern;
  import org.jetbrains.annotations.Contract;
  import org.jetbrains.annotations.NotNull;
-@@ -455,4 +456,77 @@ public enum ChatColor {
+@@ -456,4 +457,77 @@ public enum ChatColor {
              BY_CHAR.put(color.code, color);
          }
      }
@@ -431,12 +431,12 @@ index ea4ceb643239c26851bacbf45fc3f2efef3bb4be..3b8395dcb73e3fb251adf7438cbc7e95
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index adb2416887cc3b544ec36c552bdf7105328c24a5..d334c963e16590c68ecd9d1d27434c7af6f7e21c 100644
+index 7ca70b269e15e818e61a9329e2775789abb4bc73..aa9ca3e33903747a455ad0949387684ce4b917af 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -11156,4 +11156,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -11054,4 +11054,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
-     public String getItemTranslationKey() {
+     public boolean isEnabledByFeature(@NotNull World world) {
-         return Bukkit.getUnsafe().getItemTranslationKey(this);
+         return Bukkit.getDataPackManager().isEnabledByFeature(this, world);
      }
 +
 +    // Purpur start
@@ -476,10 +476,10 @@ index adb2416887cc3b544ec36c552bdf7105328c24a5..d334c963e16590c68ecd9d1d27434c7a
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 72175dcae49f75b494ab70958053ed994a8828f4..df642a55003517040be795b44a8bf107dd88810b 100644
+index bce07d84cafca677bb6fad78c21b82097f06430c..4ef0fa4f1ef72bb784674671473c6a322acadecc 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -460,4 +460,114 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -522,4 +522,114 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       */
      @Nullable
      public Location getLastDeathLocation();
@@ -595,10 +595,10 @@ index 72175dcae49f75b494ab70958053ed994a8828f4..df642a55003517040be795b44a8bf107
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9f7029d327b55c8b1b9cfef8ea2678b87dad8ddb..d87e4d177b60957eee198c3f1791dbf26dbdddd6 100644
+index f1fa97d12f97baf97beb92ca0719cf3cf906b225..dd99f53e3d559685a4b3a454a9e607c310fc6aff 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1967,6 +1967,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2190,6 +2190,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
  
@@ -617,10 +617,10 @@ index 9f7029d327b55c8b1b9cfef8ea2678b87dad8ddb..d87e4d177b60957eee198c3f1791dbf2
          /**
           * Sends the component to the player
           *
-@@ -2135,4 +2147,105 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2473,4 +2485,105 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
-     @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
+     boolean isOwnedByCurrentRegion(@NotNull Entity entity);
-     // Paper end
+     // Paper end - Folia region threading API
 +
 +    // Purpur start
 +    /**
@@ -724,10 +724,10 @@ index 9f7029d327b55c8b1b9cfef8ea2678b87dad8ddb..d87e4d177b60957eee198c3f1791dbf2
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 2b45aa9b438d7856ec448c56832b2b2100961565..4561ca02052d774bc1424f7044c34f7affd415fc 100644
+index 567a36a4887da8994c9170e2885aa8cc357efa0c..405d60bd2c99ba741d2614b16f4bda5da48a0387 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3973,6 +3973,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4235,6 +4235,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public DragonBattle getEnderDragonBattle();
  
@@ -812,8 +812,37 @@ index 2b45aa9b438d7856ec448c56832b2b2100961565..4561ca02052d774bc1424f7044c34f7a
 +    // Purpur end
 +
      /**
-      * Represents various map environment types that a world may be
+      * Get all {@link FeatureFlag} enabled in this world.
-      */
+      *
+diff --git a/src/main/java/org/bukkit/block/EntityBlockStorage.java b/src/main/java/org/bukkit/block/EntityBlockStorage.java
+index 739911cda33b373f99df627a3a378b37d7d461aa..51e78c22cd021722b963fe31d1d9175d141add1a 100644
+--- a/src/main/java/org/bukkit/block/EntityBlockStorage.java
++++ b/src/main/java/org/bukkit/block/EntityBlockStorage.java
+@@ -47,6 +47,24 @@ public interface EntityBlockStorage<T extends Entity> extends TileState {
+     @NotNull
+     List<T> releaseEntities();
+ 
++    // Purpur start
++    /**
++     * Releases a stored entity, and returns the entity in the world.
++     *
++     * @param entity Entity to release
++     * @return The entity which was released, or null if the stored entity is not in the hive
++     */
++    @org.jetbrains.annotations.Nullable
++    T releaseEntity(@NotNull org.purpurmc.purpur.entity.StoredEntity<T> entity);
++
++    /**
++     * Gets all the entities currently stored in the block.
++     *
++     * @return List of all entities which are stored in the block
++     */
++    @NotNull
++    List<org.purpurmc.purpur.entity.StoredEntity<T>> getEntities();
++    //Purpur end
+     /**
+      * Add an entity to the block.
+      *
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 index ac9a28922f8a556944a4c3649d74c32c622f0cb0..5349f16136d9348c374a7dfe5b89a71dfcb0e66d 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -853,38 +882,38 @@ index ac9a28922f8a556944a4c3649d74c32c622f0cb0..5349f16136d9348c374a7dfe5b89a71d
              server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper
              //target.timings.stopTiming(); // Spigot // Paper
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index e40f017f87d6b6b4770501b106c76dc69ec69abb..eac5830986cd0638950bbb1e6f10a30e246e09a7 100644
+index fd5d9881abfd930bb883120f018f76dc78b62b14..d3dadad49df09e85c724c93e8cc88da2c985e9b4 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -198,7 +198,7 @@ public class VersionCommand extends BukkitCommand {
+@@ -214,7 +214,7 @@ public class VersionCommand extends BukkitCommand {
          String version = Bukkit.getVersion();
          // Paper start
          if (version.startsWith("null")) { // running from ide?
--            setVersionMessage(net.kyori.adventure.text.Component.text("Unknown version, custom build?", net.kyori.adventure.text.format.NamedTextColor.YELLOW));
+-            setVersionMessage(Component.text("Unknown version, custom build?", NamedTextColor.YELLOW));
-+            setVersionMessage(net.kyori.adventure.text.Component.text("* Unknown version, custom build?", net.kyori.adventure.text.format.NamedTextColor.RED)); // Purpur
++            setVersionMessage(Component.text("* Unknown version, custom build?", NamedTextColor.RED)); // Purpur
              return;
          }
          setVersionMessage(getVersionFetcher().getVersionMessage(version));
-@@ -239,9 +239,11 @@ public class VersionCommand extends BukkitCommand {
+@@ -255,9 +255,11 @@ public class VersionCommand extends BukkitCommand {
      // Paper start
-     private void setVersionMessage(final @NotNull net.kyori.adventure.text.Component msg) {
+     private void setVersionMessage(final @NotNull Component msg) {
          lastCheck = System.currentTimeMillis();
--        final net.kyori.adventure.text.Component message = net.kyori.adventure.text.TextComponent.ofChildren(
+-        final Component message = Component.textOfChildren(
--            net.kyori.adventure.text.Component.text(Bukkit.getVersionMessage(), net.kyori.adventure.text.format.NamedTextColor.WHITE),
+-            Component.text(Bukkit.getVersionMessage(), NamedTextColor.WHITE),
--            net.kyori.adventure.text.Component.newline(),
+-            Component.newline(),
 +        // Purpur start
 +        int distance = getVersionFetcher().distance();
-+        final net.kyori.adventure.text.Component message = net.kyori.adventure.text.Component.join(net.kyori.adventure.text.JoinConfiguration.separator(net.kyori.adventure.text.Component.newline()),
++        final Component message = Component.join(net.kyori.adventure.text.JoinConfiguration.separator(Component.newline()),
 +            ChatColor.parseMM("<grey>Current: %s%s*", distance == 0 ? "<green>" : distance > 0 ? "<yellow>" : "<red>", Bukkit.getVersion()),
 +            // Purpur end
              msg
          );
-         this.versionMessage = net.kyori.adventure.text.Component.text()
+         this.versionMessage = Component.text()
 diff --git a/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java b/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java
-index bea786a8be4402f9384984e48390e745f2988dd6..5eb81fcc18b8fdec5a0e4c699525281fa6ad4d78 100644
+index 455ff52d90565838fe7640c3f045b27082a6c2f1..45f5493eebfecf56b7c0ef4659c078dfc62c0612 100644
 --- a/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java
 +++ b/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java
-@@ -228,6 +228,28 @@ public enum EnchantmentTarget {
+@@ -227,6 +227,28 @@ public enum EnchantmentTarget {
          public boolean includes(@NotNull Material item) {
              return BREAKABLE.includes(item) || (WEARABLE.includes(item) && !item.equals(Material.ELYTRA)) || item.equals(Material.COMPASS);
          }
@@ -948,13 +977,13 @@ 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 a2a423d4e4c2702ba5967223cab0432dd7d04732..cc78ce7de88a9a404ed20d5bc61b98d3107f29b3 100644
+index 9e3cb75536ae260dc898ab9dafbc1d98398782bc..ed9627dff9a33524da546c46e1d1be71ae1d1e0c 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -954,4 +954,55 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1063,4 +1063,55 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
-     boolean wouldCollideUsing(@NotNull BoundingBox boundingBox);
+     @NotNull String getScoreboardEntryName();
-     // Paper End - Collision API
+     // Paper end - entity scoreboard name
 +
 +    // Purpur start
 +    /**
@@ -1100,10 +1129,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 ffca32ae2464ea5a669029079a50585ca259a4f8..654dc0c6d98b29cf45d3826aece374726e3e9802 100644
+index a599ed2795ba1baf2cbb465d1c7145580c27e1ea..298acbfb93663e40e627f6a47d51fd87a1551feb 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1150,4 +1150,41 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1243,4 +1243,41 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void setBodyYaw(float bodyYaw);
      // Paper end
@@ -1171,10 +1200,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 88c4885569d2b8b22fce55601d50608ac8e9388c..dc437885404ae147a06cac653e519a4674a9a951 100644
+index 47fcfa2a3358766dfda2efc9bbcf5b50e3f2f7c1..eea83040ff15ea7c9bf97a45f5557294b309b4c8 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3068,4 +3068,139 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3366,4 +3366,123 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end
@@ -1203,31 +1232,11 @@ index 88c4885569d2b8b22fce55601d50608ac8e9388c..dc437885404ae147a06cac653e519a46
 +
 +    /**
 +     * Reset the idle timer back to 0
++     * @deprecated Use {@link #resetIdleDuration()} instead
 +     */
 +    void resetIdleTimer();
 +
 +    /**
-+     * Check if player is invulnerable from recently spawning or accepting a resource pack
-+     *
-+     * @return True if invulnerable
-+     */
-+    boolean isSpawnInvulnerable();
-+
-+    /**
-+     * Get invulnerable ticks remaining
-+     *
-+     * @return Invulnerable ticks
-+     */
-+    int getSpawnInvulnerableTicks();
-+
-+    /**
-+     * Set invulnerable ticks remaining
-+     *
-+     * @param invulnerableTicks Invulnerable ticks remaining
-+     */
-+    void setSpawnInvulnerableTicks(int invulnerableTicks);
-+
-+    /**
 +     * Creates debug block highlight on specified block location and show it to this player.
 +     * <p>
 +     * Clients may be inconsistent in displaying it.
@@ -1310,8 +1319,12 @@ index 88c4885569d2b8b22fce55601d50608ac8e9388c..dc437885404ae147a06cac653e519a46
 +     *
 +     * @param message The death message to show the player
 +     * @param killer The entity that killed the player
++     * @deprecated Use {@link #sendDeathScreen(net.kyori.adventure.text.Component)} instead, as 1.20 removed the killer ID from the packet.
 +     */
-+    void sendDeathScreen(@NotNull net.kyori.adventure.text.Component message, @Nullable Entity killer);
++    @Deprecated(since = "1.20")
++    default void sendDeathScreen(@NotNull net.kyori.adventure.text.Component message, @Nullable Entity killer) {
++        sendDeathScreen(message);
++    }
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/Snowman.java b/src/main/java/org/bukkit/entity/Snowman.java
@@ -1426,10 +1439,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 a8e631315f2da68895a258cf0ba9875bc88fc48c..d5648ec745e3530aecf18c3e1f3185a5f63f3d11 100644
+index cbce826add9dc2b3187c7bea00c27b785d7517df..3a98de6407d9a6307f89c207be1f09e639385ebe 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -155,7 +155,7 @@ public enum InventoryType {
+@@ -151,7 +151,7 @@ public enum InventoryType {
      SMITHING_NEW(4, "Upgrade Gear"),
      ;
  
@@ -1455,10 +1468,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 0217f98a74140bbae454d467de27c12b6060ca75..fba5b867ea9de36b45ef25c2a93fc436701bb3d9 100644
+--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
++++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
+@@ -355,4 +355,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 d15a74c38576c49df61cfab02c70fc5d8c0dd5f7..64055402076b62d32ba947830d935b79bae12d95 100644
+index 36e3fbc727cd748aa138f52976154ba32954cd87..9ecfc504df089a74add168cd5a8376d7d6b8ea0e 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;
@@ -1480,8 +1512,8 @@ index d15a74c38576c49df61cfab02c70fc5d8c0dd5f7..64055402076b62d32ba947830d935b79
  
  /**
   * Represents a stack of items.
-@@ -986,4 +998,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -1005,4 +1017,635 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
-         return livingEntity.damageItemStack(this, amount);
+         return type.isAir() || amount <= 0;
      }
      // Paper end
 +
@@ -2105,6 +2137,15 @@ index d15a74c38576c49df61cfab02c70fc5d8c0dd5f7..64055402076b62d32ba947830d935b79
 +        }
 +        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
@@ -2153,6 +2194,23 @@ index 523818cbb0d6c90481ec97123e7fe0e2ff4eea14..bfeb8171a723d84b94bfaacd8aaf7d4d
          @Override
          public int hashCode() {
              int hash = 7;
+diff --git a/src/main/java/org/bukkit/map/MapRenderer.java b/src/main/java/org/bukkit/map/MapRenderer.java
+index cb7040876a99a5a7e49b81684ef0f3b79584c376..22d8f31b1b8a5dbb5ab3275068642937c097abfe 100644
+--- a/src/main/java/org/bukkit/map/MapRenderer.java
++++ b/src/main/java/org/bukkit/map/MapRenderer.java
+@@ -54,4 +54,12 @@ public abstract class MapRenderer {
+      */
+     public abstract void render(@NotNull MapView map, @NotNull MapCanvas canvas, @NotNull Player player);
+ 
++    // Purpur - start
++    /**
++     * Check if this is an explorer (aka treasure) map.
++     *
++     * @return True if explorer map
++     */
++    public abstract boolean isExplorerMap();
++    // Purpur - end
+ }
 diff --git a/src/main/java/org/bukkit/permissions/PermissibleBase.java b/src/main/java/org/bukkit/permissions/PermissibleBase.java
 index cd3296fea01648592d2af89b3d80135acb6d0958..45797a6fbae1d8edc4211cb30def24ad4f59bd49 100644
 --- a/src/main/java/org/bukkit/permissions/PermissibleBase.java
@@ -2216,18 +2274,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 ccdca0d75868135dc7b96daeff2236b225c4add1..cad9f4ddc6be23c595e79419872f8f026703cb80 100644
+index 037af5fd6d71a526c0e6620f2db0cd6df9625261..939ed1931492854c5854cab06730cf235eba7e89 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffect.java
 +++ b/src/main/java/org/bukkit/potion/PotionEffect.java
-@@ -5,6 +5,7 @@ import com.google.common.collect.ImmutableMap;
+@@ -32,12 +32,14 @@ public class PotionEffect implements ConfigurationSerializable {
- import java.util.Map;
- import java.util.NoSuchElementException;
- import org.bukkit.Color;
-+import org.bukkit.NamespacedKey;
- import org.bukkit.configuration.serialization.ConfigurationSerializable;
- import org.bukkit.configuration.serialization.SerializableAs;
- import org.bukkit.entity.LivingEntity;
-@@ -31,12 +32,14 @@ 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";
@@ -2242,7 +2292,7 @@ index ccdca0d75868135dc7b96daeff2236b225c4add1..cad9f4ddc6be23c595e79419872f8f02
  
      /**
       * Creates a potion effect.
-@@ -49,6 +52,36 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -50,6 +52,36 @@ 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) {
@@ -2279,7 +2329,7 @@ index ccdca0d75868135dc7b96daeff2236b225c4add1..cad9f4ddc6be23c595e79419872f8f02
          Preconditions.checkArgument(type != null, "effect type cannot be null");
          this.type = type;
          this.duration = duration;
-@@ -56,6 +89,7 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -57,6 +89,7 @@ public class PotionEffect implements ConfigurationSerializable {
          this.ambient = ambient;
          this.particles = particles;
          this.icon = icon;
@@ -2287,7 +2337,7 @@ index ccdca0d75868135dc7b96daeff2236b225c4add1..cad9f4ddc6be23c595e79419872f8f02
      }
  
      /**
-@@ -103,36 +137,43 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -104,36 +137,43 @@ public class PotionEffect implements ConfigurationSerializable {
       * @param map the map to deserialize from
       */
      public PotionEffect(@NotNull Map<String, Object> map) {
@@ -2337,8 +2387,8 @@ index ccdca0d75868135dc7b96daeff2236b225c4add1..cad9f4ddc6be23c595e79419872f8f02
 +
      @NotNull
      private static PotionEffectType getEffectType(@NotNull Map<?, ?> map) {
-         int type = getInt(map, TYPE);
+         PotionEffectType effect;
-@@ -159,17 +200,33 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -166,17 +206,33 @@ public class PotionEffect implements ConfigurationSerializable {
          return def;
      }
  
@@ -2357,21 +2407,16 @@ index ccdca0d75868135dc7b96daeff2236b225c4add1..cad9f4ddc6be23c595e79419872f8f02
      @NotNull
      public Map<String, Object> serialize() {
 -        return ImmutableMap.<String, Object>builder()
--            .put(TYPE, type.getId())
--            .put(DURATION, duration)
--            .put(AMPLIFIER, amplifier)
--            .put(AMBIENT, ambient)
--            .put(PARTICLES, particles)
--            .put(ICON, icon)
--            .build();
 +        // Purpur start - add key, don't serialize if null.
 +        ImmutableMap.Builder<String, Object> builder = ImmutableMap.<String, Object>builder()
-+                .put(TYPE, type.getId())
+             .put(TYPE, type.getKey().toString())
-+                .put(DURATION, duration)
+             .put(DURATION, duration)
-+                .put(AMPLIFIER, amplifier)
+             .put(AMPLIFIER, amplifier)
-+                .put(AMBIENT, ambient)
+             .put(AMBIENT, ambient)
-+                .put(PARTICLES, particles)
+             .put(PARTICLES, particles)
-+                .put(ICON, icon);
+-            .put(ICON, icon)
+-            .build();
++            .put(ICON, icon);
 +        if(key != null) {
 +            builder.put(KEY, key.toString());
 +        }
@@ -2380,7 +2425,7 @@ index ccdca0d75868135dc7b96daeff2236b225c4add1..cad9f4ddc6be23c595e79419872f8f02
      }
  
      /**
-@@ -193,7 +250,7 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -200,7 +256,7 @@ public class PotionEffect implements ConfigurationSerializable {
              return false;
          }
          PotionEffect that = (PotionEffect) obj;
@@ -2389,7 +2434,7 @@ index ccdca0d75868135dc7b96daeff2236b225c4add1..cad9f4ddc6be23c595e79419872f8f02
      }
  
      /**
-@@ -289,6 +346,24 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -296,6 +352,24 @@ public class PotionEffect implements ConfigurationSerializable {
          return icon;
      }
  
@@ -2414,7 +2459,7 @@ index ccdca0d75868135dc7b96daeff2236b225c4add1..cad9f4ddc6be23c595e79419872f8f02
      @Override
      public int hashCode() {
          int hash = 1;
-@@ -303,6 +378,6 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -310,6 +384,6 @@ public class PotionEffect implements ConfigurationSerializable {
  
      @Override
      public String toString() {
@@ -2585,6 +2630,64 @@ index 0000000000000000000000000000000000000000..baec4c87d7ea4d54934ca22fd1eb7b46
 +        return purpur;
 +    }
 +}
+diff --git a/src/main/java/org/purpurmc/purpur/entity/StoredEntity.java b/src/main/java/org/purpurmc/purpur/entity/StoredEntity.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..29540d55532197d2381a52ea9222b5785d224ef8
+--- /dev/null
++++ b/src/main/java/org/purpurmc/purpur/entity/StoredEntity.java
+@@ -0,0 +1,52 @@
++package org.purpurmc.purpur.entity;
++
++import org.bukkit.Nameable;
++import org.bukkit.block.EntityBlockStorage;
++import org.bukkit.entity.Entity;
++import org.bukkit.entity.EntityType;
++import org.bukkit.persistence.PersistentDataHolder;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
++
++/**
++ * Represents an entity stored in a block
++ *
++ * @see org.bukkit.block.EntityBlockStorage
++ */
++public interface StoredEntity<T extends Entity> extends PersistentDataHolder, Nameable {
++    /**
++     * Checks if this entity has been released yet
++     *
++     * @return if this entity has been released
++     */
++    boolean hasBeenReleased();
++
++    /**
++     * Releases the entity from its stored block
++     *
++     * @return the released entity, or null if unsuccessful (including if this entity has already been released)
++     */
++    @Nullable
++    T release();
++
++    /**
++     * Returns the block in which this entity is stored
++     *
++     * @return the EntityBlockStorage in which this entity is stored, or null if it has been released
++     */
++    @Nullable
++    EntityBlockStorage<T> getBlockStorage();
++
++    /**
++     * Gets the entity type of this stored entity
++     *
++     * @return the type of entity this stored entity represents
++     */
++    @NotNull
++    EntityType getType();
++
++    /**
++     * Writes data to the block entity snapshot. {@link EntityBlockStorage#update()} must be run in order to update the block in game.
++     */
++    void update();
++}
 diff --git a/src/main/java/org/purpurmc/purpur/event/ExecuteCommandEvent.java b/src/main/java/org/purpurmc/purpur/event/ExecuteCommandEvent.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..bc590c4d49d32f4365a50ceb5785e798702a8179
@@ -2890,17 +2993,19 @@ index 0000000000000000000000000000000000000000..519809eab5d926dc7b0a7bad5d446d0d
 +}
 diff --git a/src/main/java/org/purpurmc/purpur/event/PreBlockExplodeEvent.java b/src/main/java/org/purpurmc/purpur/event/PreBlockExplodeEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b7db0db7f3afbccdb07390d1bcada109e9e6b30b
+index 0000000000000000000000000000000000000000..32602b398ede24a35ed8a996faa2b23455615a7b
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/event/PreBlockExplodeEvent.java
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,54 @@
 +package org.purpurmc.purpur.event;
 +
 +import org.bukkit.block.Block;
++import org.bukkit.block.BlockState;
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.HandlerList;
 +import org.bukkit.event.block.BlockExplodeEvent;
 +import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
 +import java.util.Collections;
 +
 +/**
@@ -2911,8 +3016,8 @@ index 0000000000000000000000000000000000000000..b7db0db7f3afbccdb07390d1bcada109
 +    private boolean cancelled;
 +    private final float yield;
 +
-+    public PreBlockExplodeEvent(@NotNull final Block what, final float yield) {
++    public PreBlockExplodeEvent(@NotNull final Block what, final float yield, @Nullable BlockState explodedBlockState) {
-+        super(what, Collections.emptyList(), yield);
++        super(what, Collections.emptyList(), yield, explodedBlockState);
 +        this.yield = yield;
 +        this.cancelled = false;
 +    }
@@ -3414,79 +3519,6 @@ index 0000000000000000000000000000000000000000..c268c35b541a222d50875c29770c846a
 +        return handlers;
 +    }
 +}
-diff --git a/src/main/java/org/purpurmc/purpur/event/entity/MonsterEggSpawnEvent.java b/src/main/java/org/purpurmc/purpur/event/entity/MonsterEggSpawnEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..82f8a0ea22f07954d516935fc9f73f6aa0f65aa6
---- /dev/null
-+++ b/src/main/java/org/purpurmc/purpur/event/entity/MonsterEggSpawnEvent.java
-@@ -0,0 +1,67 @@
-+package org.purpurmc.purpur.event.entity;
-+
-+import org.bukkit.entity.Entity;
-+import org.bukkit.entity.HumanEntity;
-+import org.bukkit.entity.Player;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.Event;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.inventory.ItemStack;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+public class MonsterEggSpawnEvent extends Event implements Cancellable {
-+    private static final HandlerList handlers = new HandlerList();
-+    private boolean canceled;
-+
-+    private final Player player;
-+    private Entity entity;
-+    private final ItemStack item;
-+
-+    public MonsterEggSpawnEvent(@Nullable HumanEntity player, @NotNull Entity entity, @NotNull ItemStack item) {
-+        this.player = (Player) player;
-+        this.entity = entity;
-+        this.item = item;
-+    }
-+
-+    @Nullable
-+    public Player getPlayer() {
-+        return player;
-+    }
-+
-+    @NotNull
-+    public Entity getEntity() {
-+        return entity;
-+    }
-+
-+    public void setEntity(@Nullable Entity entity) {
-+        if (entity == null) {
-+            canceled = true;
-+            return;
-+        }
-+        this.entity = entity;
-+    }
-+
-+    @NotNull
-+    public ItemStack getItem() {
-+        return item;
-+    }
-+
-+    public boolean isCancelled() {
-+        return canceled;
-+    }
-+
-+    public void setCancelled(boolean cancel) {
-+        canceled = cancel;
-+    }
-+
-+    @NotNull
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}
 diff --git a/src/main/java/org/purpurmc/purpur/event/entity/PreEntityExplodeEvent.java b/src/main/java/org/purpurmc/purpur/event/entity/PreEntityExplodeEvent.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..2d4f68228861492baaea0bcc604dfef623b337ba
@@ -4092,7 +4124,7 @@ index 12946bd55fcf7c40d39081779a7fa30049ee6165..9c2d605c50cbf9aefa56ec209df9f6ce
  
  }
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 06e96e5c98f1a7a68c8b4b5e527314c1aa774e38..49bba9a7a02b9cf3a552583315eff2b7dbe060c0 100644
+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 {

patches/api/0003-Build-system-changes.patch

@@ -0,0 +1,115 @@
+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] Build system changes
+
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 41d7b75e904b94073dfcd12b776a7759a963b66f..c37b8a63b050dcc2ad2b33955017df48120c4393 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -9,11 +9,13 @@ java {
+     withJavadocJar()
+ }
+ 
++/* // Plazma - Use libs.versions.toml
+ val annotationsVersion = "24.0.1"
+ val bungeeCordChatVersion = "1.20-R0.1"
+ val adventureVersion = "4.14.0"
+ val slf4jVersion = "1.8.0-beta4"
+ val log4jVersion = "2.17.1"
++ */ // Plazma - Use libs.versions.toml
+ val apiAndDocs: Configuration by configurations.creating {
+     attributes {
+         attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
+@@ -28,15 +30,39 @@ configurations.api {
+ 
+ dependencies {
+     // api dependencies are listed transitively to API consumers
++    /* // Plazma - Use libs.versions.toml
+     api("com.google.guava:guava:32.1.2-jre")
+     api("com.google.code.gson:gson:2.10.1")
+     api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") // Paper
+     api("org.yaml:snakeyaml:2.2")
+     api("org.joml:joml:1.10.5")
++     */ // Plazma - Use libs.versions.toml
+     // Paper start
+-    api("com.googlecode.json-simple:json-simple:1.1.1") {
++    api(api.jsonsimple) { // Plazma - Use libs.versions.toml
+         isTransitive = false // includes junit
+     }
++    // Plazma start
++    implementation(common.bundles.asm)
++
++    compileOnly(api.findbugs)
++    compileOnly(common.bundles.maven)
++
++    compileOnly(api.annotations)
++    compileOnlyApi(api.checkerqual)
++    testCompileOnly(api.bundles.annotations)
++
++    testImplementation(common.asm.tree)
++    testImplementation(common.bundles.test)
++    testImplementation(common.commons.lang3)
++
++    api(api.bundles.api)
++    api(common.snakeyaml)
++    api(common.log4j.api)
++    api(common.maven.provider)
++    apiAndDocs(platform(common.adventure.bom))
++    apiAndDocs(common.bundles.adventure)
++    /*
++    // Plazma end
+     api("it.unimi.dsi:fastutil:8.5.6")
+     apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
+     apiAndDocs("net.kyori:adventure-api")
+@@ -73,6 +99,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 libs.versions.toml
+ }
+ 
+ // Paper start
+@@ -133,25 +160,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 libs.versions.toml
++        "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.transport.orNull?.version}", // Paper
++        // Plazma end
+     )
+     options.tags("apiNote:a:API Note:")
+ 

patches/api/0004-Bump-Bungeecord-Chat-API-to-1.19-R0.1-SNAPSHOT.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <alphakr93@outlook.com>
-Date: Thu, 22 Dec 2022 20:29:45 +0900
-Subject: [PATCH] Bump Bungeecord Chat API to 1.19-R0.1-SNAPSHOT
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index b5835fa536f90b7f88a5ee4df78733cf43e1cb23..42de5c470a2fbb1e0bc9b809c033e3afe30502fa 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -25,7 +25,7 @@ dependencies {
-     // api dependencies are listed transitively to API consumers
-     api("com.google.guava:guava:31.1-jre")
-     api("com.google.code.gson:gson:2.10")
--    api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.9") // Paper
-+    api("net.md-5:bungeecord-chat:1.19-R0.1-SNAPSHOT") // Paper // Plazma
-     api("org.yaml:snakeyaml:1.33")
-     api("org.joml:joml:1.10.5")
-     // Paper start

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 d87e4d177b60957eee198c3f1791dbf26dbdddd6..3fbc6de9d49697baebd22f9e5977812eadff00d3 100644
+index dd99f53e3d559685a4b3a454a9e607c310fc6aff..3a3713573ba37530449f9254c0a7205530c9737a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1967,6 +1967,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2202,6 +2202,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
-         // Paper end
+         // Purpur end
  
 +        // Plazma start
 +        @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
+          * Sends the component to the player
-         public org.bukkit.configuration.file.YamlConfiguration getPurpurConfig() {
+          *

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

@@ -0,0 +1,79 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: IPECTER <ipectert@gmail.com>
+Date: Wed, 6 Sep 2023 15:04:25 +0900
+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
+--- 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;
+  */
+ public abstract class Event {
+     private String name;
+-    private final boolean async;
++    private final net.kyori.adventure.util.TriState async; // Plazma - Optimize spigot event bus
+ 
+     /**
+      * The default constructor is defined for cleaner code. This constructor
+@@ -32,9 +32,35 @@ public abstract class Event {
+      *     by default from default constructor
+      */
+     public Event(boolean isAsync) {
++        this(net.kyori.adventure.util.TriState.byBoolean(isAsync)); // Plazma - Optimize spigot event bus
++    }
++
++    // Plazma start - Optimize spigot event bus
++    /**
++     * This constructor is used to explicitly declare an event as synchronous
++     * or asynchronous or potentially unset.
++     *
++     * @param isAsync true indicates the event will fire asynchronously, false
++     *                by default from default constructor, unset indicates that the event may be called on either the server thread or off the server
++     *                thread.
++     */
++    public Event(@NotNull final net.kyori.adventure.util.TriState isAsync) {
+         this.async = isAsync;
+     }
+ 
++    /**
++     * Returns a tristate that, when resolving to true or false, has the exact indications defined by {@link #isAsynchronous()}.
++     * <p>
++     * If the tristate resolves to NOT_SET, the event may or may not have been fired off the main thread, meaning a plugin would have
++     * to validate what thread the spigot event bus was called on.
++     *
++     * @return the tristate enum.
++     */
++    public final @NotNull net.kyori.adventure.util.TriState asynchronous() {
++        return this.async;
++    }
++    // Plazma end
++
+     // Paper start
+     /**
+      * Calls the event and tests if cancelled.
+@@ -92,7 +118,7 @@ public abstract class Event {
+      * @return false by default, true if the event fires asynchronously
+      */
+     public final boolean isAsynchronous() {
+-        return async;
++        return this.async == net.kyori.adventure.util.TriState.TRUE; // Plazma - Optimize spigot event bus
+     }
+ 
+     public enum Result {
+diff --git a/src/main/java/org/bukkit/plugin/RegisteredListener.java b/src/main/java/org/bukkit/plugin/RegisteredListener.java
+index 3b3d9642a8d63798dc28f2f8df77f0466451cbff..0702e1692f7e671188ac18e22ca29f369b0b6352 100644
+--- a/src/main/java/org/bukkit/plugin/RegisteredListener.java
++++ b/src/main/java/org/bukkit/plugin/RegisteredListener.java
+@@ -62,8 +62,8 @@ public class RegisteredListener {
+      * @throws EventException If an event handler throws an exception.
+      */
+     public void callEvent(@NotNull final Event event) throws EventException {
+-        if (event instanceof Cancellable) {
+-            if (((Cancellable) event).isCancelled() && isIgnoringCancelled()) {
++        if (isIgnoringCancelled()) { // Plazma - Optimize spigot event bus
++            if (event instanceof Cancellable cancellable && cancellable.isCancelled()) { // Plazma - Optimize spigot event bus
+                 return;
+             }
+         }

patches/api/0005-Publish-Packages.patch

@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <alphakr93@outlook.com>
-Date: Fri, 6 Jan 2023 17:11:31 +0900
-Subject: [PATCH] Publish Packages
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 7b38042c32295ef7c5ea3c212170cc8fcdf0d7a0..1e300e51fa3413f9846c686545f2b7deb0ac5160 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -156,3 +156,23 @@ 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

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

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Thu, 28 Sep 2023 12:21:36 +0900
+Subject: [PATCH] Implement No Chat Reports
+
+
+diff --git a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
+index 2eb13c049fa917d41fa9ad17fdec9ec4c33701a8..5d50f83a76affc74f989870ca1bc8d7a75f3b2ba 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 {
+          * Fallback cause
+          */
+         UNKNOWN,
++
++        NCR_NOT_INSTALLED, // Plazma - Implement No Chat Reports
+     }
+     // Paper end
+ }

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

@@ -0,0 +1,78 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Sun, 14 Jan 2024 19:51:19 +0900
+Subject: [PATCH] Build system changes
+
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index f083d422678f5fd21825439944af888fbdc9bf3c..e30b51ed329f0c66a2329da45996ef0fc0db8ffb 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -19,6 +19,7 @@ dependencies {
+         exclude("io.papermc.paper", "paper-api")
+     }
+     // Purpur end
++    /* // Plazma - Use libs.versions.toml
+     // Paper start
+     implementation("org.jline:jline-terminal-jansi:3.21.0")
+     implementation("net.minecrell:terminalconsoleappender:1.3.0")
+@@ -46,9 +47,32 @@ dependencies {
+     runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
+     runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
+     // Paper start - Use Velocity cipher
+-    implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {
++    // Plazma start - Use libs.versions.toml
++     */
++    implementation(common.snakeyaml)
++    implementation(common.bundles.asm)
++    implementation(common.commons.lang2)
++    implementation(common.adventure.serializer.ansi)
++    implementation(common.log4j.core)
++    implementation(common.log4j.iostreams)
++    log4jPlugins.annotationProcessorConfigurationName(common.log4j.core)
++    runtimeOnly(log4jPlugins.output)
++    alsoShade(log4jPlugins.output)
++
++    implementation(server.ansi)
++    implementation(server.bundles.implementation)
++    implementation(server.velocity) {
++    // Plazma end
+         isTransitive = false
+     }
++
++    runtimeOnly(common.bundles.maven)
++    runtimeOnly(common.maven.provider)
++    runtimeOnly(server.bundles.runtime)
++
++    testImplementation(common.bundles.test)
++    testImplementation(server.classgraph)
++    /* // Plazma - Use libs.versions.toml
+     // Paper end
+ 
+     runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+@@ -57,19 +81,22 @@ dependencies {
+ 
+     // Pufferfish start
+     implementation("org.yaml:snakeyaml:1.32")
+-    implementation ("com.github.carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
++     */ // Plazma - Use libs.versions.toml
++    implementation(server.simpleyaml) { // Plazma - Use libs.versions.toml
+         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 // Plazma - Use libs.versions.toml
++    //implementation("org.mozilla:rhino-engine:1.7.14") // Purpur // Plazma - Use libs.versions.toml
+     implementation("dev.omega24:upnp4j:1.0") // Purpur
+ 
++    /* // Plazma - Use libs.versions.toml
+     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")
++     */ // Plazma - Use libs.versions.toml
+ }
+ 
+ val craftbukkitPackageVersion = "1_20_R2" // Paper

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

@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: IPECTER <ipectert@gmail.com>
 Date: Tue, 30 May 2023 12:12:29 +0900
-Subject: [PATCH] MC-Dev-fixes
+Subject: [PATCH] MC Dev fixes
 
 
 diff --git a/src/main/java/net/minecraft/util/datafix/fixes/LeavesFix.java b/src/main/java/net/minecraft/util/datafix/fixes/LeavesFix.java
-index 75f1d1f06978d836aab5ebbfe8f7d1e0ca5a95b6..89d70a992e0bcc8e7292c4f736470eafd8747b24 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 {
@@ -15,15 +15,15 @@ index 75f1d1f06978d836aab5ebbfe8f7d1e0ca5a95b6..89d70a992e0bcc8e7292c4f736470eaf
 -                    Typed<?> typed2 = typedx.updateTyped(opticFinder2, (typed) -> {
 -                        Int2ObjectMap<LeavesFix.LeavesSection> int2ObjectMap = new Int2ObjectOpenHashMap<>(typed.getAllTyped(opticFinder3).stream().map((typedx) -> {
 -                            return new LeavesFix.LeavesSection(typedx, this.getInputSchema());
-+                    Typed<?> typed2 = typedx.updateTyped(opticFinder2, (typed2x) -> {
++                    Typed<?> typed2 = typedx.updateTyped(opticFinder2, (typed2x) -> { // Plazma - decompile fix
-+                        Int2ObjectMap<LeavesFix.LeavesSection> int2ObjectMap = new Int2ObjectOpenHashMap<>(typed2x.getAllTyped(opticFinder3).stream().map((typedx2) -> {
++                        Int2ObjectMap<LeavesFix.LeavesSection> int2ObjectMap = new Int2ObjectOpenHashMap<>(typed2x.getAllTyped(opticFinder3).stream().map((typedx2) -> { // Plazma - decompile fix
-+                            return new LeavesFix.LeavesSection(typedx2, this.getInputSchema());
++                            return new LeavesFix.LeavesSection(typedx2, this.getInputSchema()); // Plazma - decompile fix
                          }).collect(Collectors.toMap(LeavesFix.Section::getIndex, (leavesSection) -> {
                              return leavesSection;
                          })));
                          if (int2ObjectMap.values().stream().allMatch(LeavesFix.Section::isSkippable)) {
 -                            return typed;
-+                            return typed2x;
++                            return typed2x; // Plazma - decompile fix
                          } else {
                              List<IntSet> list = Lists.newArrayList();
  
@@ -33,8 +33,8 @@ index 75f1d1f06978d836aab5ebbfe8f7d1e0ca5a95b6..89d70a992e0bcc8e7292c4f736470eaf
  
 -                            return typed.updateTyped(opticFinder3, (typedx) -> {
 -                                return int2ObjectMap.get(typedx.get(DSL.remainderFinder()).get("Y").asInt(0)).write(typedx);
-+                            return typed.updateTyped(opticFinder3, (typedx2) -> {
++                            return typed.updateTyped(opticFinder3, (typedx2) -> { // Plazma - decompile fix
-+                                return int2ObjectMap.get(typedx2.get(DSL.remainderFinder()).get("Y").asInt(0)).write(typedx2);
++                                return int2ObjectMap.get(typedx2.get(DSL.remainderFinder()).get("Y").asInt(0)).write(typedx2); // Plazma - decompile fix
                              });
                          }
                      });
@@ -44,8 +44,8 @@ index 75f1d1f06978d836aab5ebbfe8f7d1e0ca5a95b6..89d70a992e0bcc8e7292c4f736470eaf
                  Optional<List<Pair<String, Dynamic<?>>>> optional = typed.getOptional(this.paletteFinder);
 -                this.palette = optional.map((list) -> {
 -                    return list.stream().map(Pair::getSecond).collect(Collectors.toList());
-+                this.palette = (java.util.List)optional.map((list) -> {
++                this.palette = (List) optional.map((list) -> { // Plazma - decompile fix
-+                    return (java.util.List)list.stream().map(Pair::getSecond).collect(Collectors.toList());
++                    return (List) list.stream().map(Pair::getSecond).collect(Collectors.toList()); // Plazma - decompile fix
                  }).orElse(ImmutableList.of());
                  Dynamic<?> dynamic = typed.get(DSL.remainderFinder());
                  this.index = dynamic.get("Y").asInt(0);
@@ -54,7 +54,7 @@ index 75f1d1f06978d836aab5ebbfe8f7d1e0ca5a95b6..89d70a992e0bcc8e7292c4f736470eaf
              return this.isSkippable() ? typed : typed.update(DSL.remainderFinder(), (dynamic) -> {
                  return dynamic.set("BlockStates", dynamic.createLongList(Arrays.stream(this.storage.getRaw())));
 -            }).set(this.paletteFinder, this.palette.stream().map((dynamic) -> {
-+            }).set(this.paletteFinder, (java.util.List)this.palette.stream().map((dynamic) -> {
++            }).set(this.paletteFinder, (List) this.palette.stream().map((dynamic) -> { // Plazma - decompile fix
                  return Pair.of(References.BLOCK_STATE.typeName(), dynamic);
              }).collect(Collectors.toList()));
          }

patches/server/0005-Rebrand.patch

@@ -5,24 +5,24 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9c01005751c0088f560f96401cdfdebbbda4e7ec..46fda579a95f9ab92a1ba61cad8218024a722208 100644
+index e30b51ed329f0c66a2329da45996ef0fc0db8ffb..d91928799014596de519d1a1b3f1bb0a80ac925c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -7,7 +7,7 @@ plugins {
+@@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating
- }
  
  dependencies {
--    implementation(project(":purpur-api")) // Purpur
+     // Purpur start
-+    implementation(project(":plazma-api")) // Purpur
+-    implementation(project(":purpur-api"))
-     implementation("io.papermc.paper:paper-mojangapi:1.19.4-R0.1-SNAPSHOT") // Purpur
++    implementation(project(":plazma-api"))
-     // Paper start
+     implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
-     implementation("org.jline:jline-terminal-jansi:3.21.0")
+         exclude("io.papermc.paper", "paper-api")
-@@ -81,7 +81,7 @@ tasks.jar {
+     }
+@@ -120,7 +120,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
 -            "Implementation-Version" to "git-Purpur-$implementationVersion", // Pufferfish // Purpur
-+            "Implementation-Version" to "git-Plazma-$implementationVersion", // Pufferfish // Purpur // Plazma
++            "Implementation-Version" to "git-Plazma-$implementationVersion", // Pufferfish // Purpur
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
@@ -49,7 +49,7 @@ index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..7d80d2cf5d607d6051e99e4b08bc1b76
                  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..7167c08053071f71c45162d455efed86ffcd2c6e 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;
@@ -68,7 +68,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..fec95437c1ad602f64c4d4d02c276199
 -        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
++        final Component updateMessage = getUpdateStatusMessage("PlazmaMC/PlazmaBukkit", "ver/" + getMinecraftVersion(), parts[0]); // Purpur // Plazma
          final Component history = getHistory();
  
          return history != null ? Component.join(net.kyori.adventure.text.JoinConfiguration.separator(Component.newline()), history, updateMessage) : updateMessage; // Purpur
@@ -131,7 +131,7 @@ index 3cb56595822799926a8141e60a42f5d1edfc6de5..19d1d136fc28d6c114f6bc44c6450d2d
                  .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 b5b6657e52e4f7a630229bd3ba433438af293e22..c468733f44ccb3ff4ba3c20921a4ec52658f0689 100644
+index ed3527612315e6e0649182ce4e1ae2834b0918a9..ae02c029f0169d30a34d4a4e65ea6cb4fa498111 100644
 --- a/src/main/java/net/minecraft/CrashReport.java
 +++ b/src/main/java/net/minecraft/CrashReport.java
 @@ -35,7 +35,7 @@ public class CrashReport {
@@ -153,32 +153,33 @@ index b5b6657e52e4f7a630229bd3ba433438af293e22..c468733f44ccb3ff4ba3c20921a4ec52
          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 cdbf10339a8e8846a8c364de483a0ccd95cd225a..5ed7acb332b8982a724e5002e12f18fe32dd4dd4 100644
+index ec268189b19b6fa5c4521f96ce211a531db35ec5..ce45a93fe835fd1ea4411c78df430aaa903c83c3 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -81,6 +81,17 @@ public class Main {
+@@ -108,6 +108,18 @@ public class Main {
+             */ // CraftBukkit end
  
-     @DontObfuscate
+         try {
-     public static void main(final OptionSet optionset) { // CraftBukkit - replaces main(String[] astring)
++            // Plazma start - Branding
-+        // Plazma start - Branding
++            System.out.println("""
-+        System.out.println("""
++                    \033[38;2;236;61;151m┏\033[38;2;236;61;157m━\033[38;2;237;62;163m━\033[38;2;237;62;169m━\033[38;2;238;62;175m━\033[38;2;238;63;181m━\033[38;2;239;63;187m┓\033[38;2;239;63;193m \033[38;2;239;64;200m┏\033[38;2;240;64;206m━\033[38;2;240;64;212m┓\033[38;2;241;65;218m \033[38;2;241;65;224m \033[38;2;242;65;230m \033[38;2;242;66;236m \033[38;2;242;66;242m \033[38;2;237;66;243m \033[38;2;232;67;243m┏\033[38;2;227;67;244m━\033[38;2;221;67;244m━\033[38;2;216;68;244m━\033[38;2;211;68;245m━\033[38;2;205;69;245m┓\033[38;2;200;69;246m \033[38;2;195;69;246m┏\033[38;2;189;70;246m━\033[38;2;184;70;247m━\033[38;2;179;70;247m━\033[38;2;173;71;247m━\033[38;2;168;71;248m━\033[38;2;163;72;248m━\033[38;2;157;72;249m┓\033[38;2;152;72;249m┏\033[38;2;147;73;249m━\033[38;2;141;73;250m━\033[38;2;136;74;250m┓\033[38;2;131;74;250m \033[38;2;125;74;251m \033[38;2;120;75;251m \033[38;2;115;75;251m┏\033[38;2;109;76;252m━\033[38;2;104;76;252m━\033[38;2;99;77;252m┓\033[38;2;94;77;253m \033[38;2;88;77;253m┏\033[38;2;83;78;253m━\033[38;2;78;79;254m━\033[38;2;79;85;254m━\033[38;2;79;91;254m━\033[38;2;80;97;255m┓\033[38;2;80;103;255m\s
-+                   \033[38;2;236;61;151m┏\033[38;2;236;61;157m━\033[38;2;237;62;163m━\033[38;2;237;62;169m━\033[38;2;238;62;175m━\033[38;2;238;63;181m━\033[38;2;239;63;187m┓\033[38;2;239;63;193m \033[38;2;239;64;200m┏\033[38;2;240;64;206m━\033[38;2;240;64;212m┓\033[38;2;241;65;218m \033[38;2;241;65;224m \033[38;2;242;65;230m \033[38;2;242;66;236m \033[38;2;242;66;242m \033[38;2;237;66;243m \033[38;2;232;67;243m┏\033[38;2;227;67;244m━\033[38;2;221;67;244m━\033[38;2;216;68;244m━\033[38;2;211;68;245m━\033[38;2;205;69;245m┓\033[38;2;200;69;246m \033[38;2;195;69;246m┏\033[38;2;189;70;246m━\033[38;2;184;70;247m━\033[38;2;179;70;247m━\033[38;2;173;71;247m━\033[38;2;168;71;248m━\033[38;2;163;72;248m━\033[38;2;157;72;249m┓\033[38;2;152;72;249m┏\033[38;2;147;73;249m━\033[38;2;141;73;250m━\033[38;2;136;74;250m┓\033[38;2;131;74;250m \033[38;2;125;74;251m \033[38;2;120;75;251m \033[38;2;115;75;251m┏\033[38;2;109;76;252m━\033[38;2;104;76;252m━\033[38;2;99;77;252m┓\033[38;2;94;77;253m \033[38;2;88;77;253m┏\033[38;2;83;78;253m━\033[38;2;78;79;254m━\033[38;2;79;85;254m━\033[38;2;79;91;254m━\033[38;2;80;97;255m┓\033[38;2;80;103;255m\s
++                    \033[38;2;236;61;151m┃\033[38;2;236;61;157m┏\033[38;2;237;62;163m━\033[38;2;237;62;169m━\033[38;2;238;62;175m━\033[38;2;238;63;181m┓\033[38;2;239;63;187m┗\033[38;2;239;63;193m┓\033[38;2;239;64;200m┃\033[38;2;240;64;206m \033[38;2;240;64;212m┃\033[38;2;241;65;218m \033[38;2;241;65;224m \033[38;2;242;65;230m \033[38;2;242;66;236m \033[38;2;242;66;242m \033[38;2;237;66;243m┏\033[38;2;232;67;243m┛\033[38;2;227;67;244m┏\033[38;2;221;67;244m━\033[38;2;216;68;244m━\033[38;2;211;68;245m┓\033[38;2;205;69;245m┗\033[38;2;200;69;246m┓\033[38;2;195;69;246m┗\033[38;2;189;70;246m━\033[38;2;184;70;247m━\033[38;2;179;70;247m┓\033[38;2;173;71;247m \033[38;2;168;71;248m \033[38;2;163;72;248m┏\033[38;2;157;72;249m┛\033[38;2;152;72;249m┃\033[38;2;147;73;249m \033[38;2;141;73;250m \033[38;2;136;74;250m┗\033[38;2;131;74;250m┓\033[38;2;125;74;251m \033[38;2;120;75;251m┏\033[38;2;115;75;251m┛\033[38;2;109;76;252m \033[38;2;104;76;252m \033[38;2;99;77;252m┃\033[38;2;94;77;253m┏\033[38;2;88;77;253m┛\033[38;2;83;78;253m┏\033[38;2;78;79;254m━\033[38;2;79;85;254m━\033[38;2;79;91;254m┓\033[38;2;80;97;255m┗\033[38;2;80;103;255m┓
-+                   \033[38;2;236;61;151m┃\033[38;2;236;61;157m┏\033[38;2;237;62;163m━\033[38;2;237;62;169m━\033[38;2;238;62;175m━\033[38;2;238;63;181m┓\033[38;2;239;63;187m┗\033[38;2;239;63;193m┓\033[38;2;239;64;200m┃\033[38;2;240;64;206m \033[38;2;240;64;212m┃\033[38;2;241;65;218m \033[38;2;241;65;224m \033[38;2;242;65;230m \033[38;2;242;66;236m \033[38;2;242;66;242m \033[38;2;237;66;243m┏\033[38;2;232;67;243m┛\033[38;2;227;67;244m┏\033[38;2;221;67;244m━\033[38;2;216;68;244m━\033[38;2;211;68;245m┓\033[38;2;205;69;245m┗\033[38;2;200;69;246m┓\033[38;2;195;69;246m┗\033[38;2;189;70;246m━\033[38;2;184;70;247m━\033[38;2;179;70;247m┓\033[38;2;173;71;247m \033[38;2;168;71;248m \033[38;2;163;72;248m┏\033[38;2;157;72;249m┛\033[38;2;152;72;249m┃\033[38;2;147;73;249m \033[38;2;141;73;250m \033[38;2;136;74;250m┗\033[38;2;131;74;250m┓\033[38;2;125;74;251m \033[38;2;120;75;251m┏\033[38;2;115;75;251m┛\033[38;2;109;76;252m \033[38;2;104;76;252m \033[38;2;99;77;252m┃\033[38;2;94;77;253m┏\033[38;2;88;77;253m┛\033[38;2;83;78;253m┏\033[38;2;78;79;254m━\033[38;2;79;85;254m━\033[38;2;79;91;254m┓\033[38;2;80;97;255m┗\033[38;2;80;103;255m┓
++                    \033[38;2;236;61;151m┃\033[38;2;236;61;157m┗\033[38;2;237;62;163m━\033[38;2;237;62;169m━\033[38;2;238;62;175m━\033[38;2;238;63;181m┛\033[38;2;239;63;187m┏\033[38;2;239;63;193m┛\033[38;2;239;64;200m┃\033[38;2;240;64;206m \033[38;2;240;64;212m┃\033[38;2;241;65;218m \033[38;2;241;65;224m \033[38;2;242;65;230m \033[38;2;242;66;236m \033[38;2;242;66;242m \033[38;2;237;66;243m┃\033[38;2;232;67;243m \033[38;2;227;67;244m┗\033[38;2;221;67;244m━\033[38;2;216;68;244m━\033[38;2;211;68;245m┛\033[38;2;205;69;245m \033[38;2;200;69;246m┃\033[38;2;195;69;246m \033[38;2;189;70;246m \033[38;2;184;70;247m┏\033[38;2;179;70;247m┛\033[38;2;173;71;247m \033[38;2;168;71;248m┏\033[38;2;163;72;248m┛\033[38;2;157;72;249m \033[38;2;152;72;249m┃\033[38;2;147;73;249m \033[38;2;141;73;250m┏\033[38;2;136;74;250m┓\033[38;2;131;74;250m┗\033[38;2;125;74;251m━\033[38;2;120;75;251m┛\033[38;2;115;75;251m┏\033[38;2;109;76;252m┓\033[38;2;104;76;252m \033[38;2;99;77;252m┃\033[38;2;94;77;253m┃\033[38;2;88;77;253m \033[38;2;83;78;253m┗\033[38;2;78;79;254m━\033[38;2;79;85;254m━\033[38;2;79;91;254m┛\033[38;2;80;97;255m \033[38;2;80;103;255m┃
-+                   \033[38;2;236;61;151m┃\033[38;2;236;61;157m┗\033[38;2;237;62;163m━\033[38;2;237;62;169m━\033[38;2;238;62;175m━\033[38;2;238;63;181m┛\033[38;2;239;63;187m┏\033[38;2;239;63;193m┛\033[38;2;239;64;200m┃\033[38;2;240;64;206m \033[38;2;240;64;212m┃\033[38;2;241;65;218m \033[38;2;241;65;224m \033[38;2;242;65;230m \033[38;2;242;66;236m \033[38;2;242;66;242m \033[38;2;237;66;243m┃\033[38;2;232;67;243m \033[38;2;227;67;244m┗\033[38;2;221;67;244m━\033[38;2;216;68;244m━\033[38;2;211;68;245m┛\033[38;2;205;69;245m \033[38;2;200;69;246m┃\033[38;2;195;69;246m \033[38;2;189;70;246m \033[38;2;184;70;247m┏\033[38;2;179;70;247m┛\033[38;2;173;71;247m \033[38;2;168;71;248m┏\033[38;2;163;72;248m┛\033[38;2;157;72;249m \033[38;2;152;72;249m┃\033[38;2;147;73;249m \033[38;2;141;73;250m┏\033[38;2;136;74;250m┓\033[38;2;131;74;250m┗\033[38;2;125;74;251m━\033[38;2;120;75;251m┛\033[38;2;115;75;251m┏\033[38;2;109;76;252m┓\033[38;2;104;76;252m \033[38;2;99;77;252m┃\033[38;2;94;77;253m┃\033[38;2;88;77;253m \033[38;2;83;78;253m┗\033[38;2;78;79;254m━\033[38;2;79;85;254m━\033[38;2;79;91;254m┛\033[38;2;80;97;255m \033[38;2;80;103;255m┃
++                    \033[38;2;236;61;151m┃\033[38;2;236;61;157m \033[38;2;237;62;163m┏\033[38;2;237;62;169m━\033[38;2;238;62;175m━\033[38;2;238;63;181m━\033[38;2;239;63;187m┛\033[38;2;239;63;193m \033[38;2;239;64;200m┃\033[38;2;240;64;206m \033[38;2;240;64;212m┃\033[38;2;241;65;218m \033[38;2;241;65;224m \033[38;2;242;65;230m \033[38;2;242;66;236m \033[38;2;242;66;242m \033[38;2;237;66;243m┃\033[38;2;232;67;243m \033[38;2;227;67;244m┏\033[38;2;221;67;244m━\033[38;2;216;68;244m━\033[38;2;211;68;245m┓\033[38;2;205;69;245m \033[38;2;200;69;246m┃\033[38;2;195;69;246m \033[38;2;189;70;246m┏\033[38;2;184;70;247m┛\033[38;2;179;70;247m \033[38;2;173;71;247m┏\033[38;2;168;71;248m┛\033[38;2;163;72;248m \033[38;2;157;72;249m \033[38;2;152;72;249m┃\033[38;2;147;73;249m \033[38;2;141;73;250m┃\033[38;2;136;74;250m┗\033[38;2;131;74;250m┓\033[38;2;125;74;251m \033[38;2;120;75;251m┏\033[38;2;115;75;251m┛\033[38;2;109;76;252m┃\033[38;2;104;76;252m \033[38;2;99;77;252m┃\033[38;2;94;77;253m┃\033[38;2;88;77;253m \033[38;2;83;78;253m┏\033[38;2;78;79;254m━\033[38;2;79;85;254m━\033[38;2;79;91;254m┓\033[38;2;80;97;255m \033[38;2;80;103;255m┃
-+                   \033[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┛
++                    """);
-+                   """);
++            if (org.plazmamc.plazma.Options.iKnowWhatIAmDoing)
-+        LOGGER.warn("Warning! Plazma may cause unexpected problems, so DO NOT USE it on a production server!");
++                LOGGER.warn("Warning! Plazma may cause unexpected problems, so be sure to test it thoroughly before using it on a public server.");
-+        // Plazma end
++            // Plazma end
-         SharedConstants.tryDetectVersion();
+             // Paper start
-         /* CraftBukkit start - Replace everything
+             if (Boolean.getBoolean("Paper.isRunDev")) {
-         OptionParser optionparser = new OptionParser();
+                 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 beb05039926e1fb7a656dfcd0c503f82db67fc46..615c456de68a20d0e95b30e124a2bdf46039408f 100644
+index b61c4d1ebb9c15a7ecd7bec5eb864851c053fb7e..b4d5bca6e3a39186a988098fb5d4cae97a776e79 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -930,7 +930,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -913,7 +913,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          shutdownThread = Thread.currentThread();
          org.spigotmc.WatchdogThread.doStop(); // Paper
          if (!isSameThread()) {
@@ -187,8 +188,21 @@ index beb05039926e1fb7a656dfcd0c503f82db67fc46..615c456de68a20d0e95b30e124a2bdf4
              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 cda4544ae96a4fcb5c6c4483df67a59f1b53fd27..fe82a20efb2b130a568bc06aec5b86d3082062a3 100644
+--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
+@@ -58,7 +58,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", "Plazma Server"); // Purpur // Plazma
+     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 56cf3d5b8e365ce6b1ec88464d9079d774206755..9133e57b83c3348b5cd7a6b31f5ec380e8a12560 100644
+index be7b3fe2dc84493dcde9e185717b0b7c7c2e9822..cfdaa744ff40c8a171ca9b36b305b326fc57c32c 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 {
@@ -219,11 +233,11 @@ index 56cf3d5b8e365ce6b1ec88464d9079d774206755..9133e57b83c3348b5cd7a6b31f5ec380
                      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 b8001bca2a33ec1e60566948a651400418a6e9e7..92b440b24c6b083f81837611d08fbd6773a2a6e6 100644
+index 25540a7f5631acd856726cdb44bace9be7dab401..36a1ac09bec7b4139d1cd44e6ecda72fc30fa8c4 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1041,7 +1041,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1323,7 +1323,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-             TickingBlockEntity tickingblockentity = (TickingBlockEntity) this.blockEntityTickers.get(tileTickPosition);
+             TickingBlockEntity tickingblockentity = (TickingBlockEntity) this.blockEntityTickers.get(this.tileTickPosition);
              // Spigot start
              if (tickingblockentity == null) {
 -                this.getCraftServer().getLogger().severe("Spigot has detected a null entity and has removed it, preventing a crash");
@@ -232,10 +246,10 @@ index b8001bca2a33ec1e60566948a651400418a6e9e7..92b440b24c6b083f81837611d08fbd67
                  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 bd502ca721de0cab438d995efa00ad0554c0d2fe..d72f61f545c3929825e628607b85e0d25f79db1f 100644
+index db571f658f636cdda1dcdbaffa0c4da67fae11ad..0ba8a251bf1f5a7a6f27823686bf0d636feba769 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
-@@ -113,7 +113,7 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -153,7 +153,7 @@ public class RegionFileStorage implements AutoCloseable {
  
      // Paper start
      private static void printOversizedLog(String msg, Path file, int x, int z) {
@@ -245,10 +259,10 @@ index bd502ca721de0cab438d995efa00ad0554c0d2fe..d72f61f545c3929825e628607b85e0d2
  
      private static final int DEFAULT_SIZE_THRESHOLD = 1024 * 8;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3f80b16c8d69f284a26b16cf2513a955005bf458..26c4f8da23bf83abf2e78894b731312028bed191 100644
+index a8a887236c68567816badc0620833755c84a4b03..09c292e22788fdf48b639265f24595e14aceba7a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -259,7 +259,7 @@ import javax.annotation.Nullable; // Paper
+@@ -269,7 +269,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
@@ -257,11 +271,33 @@ index 3f80b16c8d69f284a26b16cf2513a955005bf458..26c4f8da23bf83abf2e78894b7313120
      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 d41f9c4a3c992b5dadacb4fcb1107235fff79fa8..49d0cd1275c6bf5165e4880dc322bc93ad3848f3 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 - Rebranding
+ 
+                 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 - Rebranding
+                         .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 7ef5980f7321662aa7034a74c2f6926846425db9..00200576bad5a92c65df762239dbec9a6e9a239b 100644
+index 9c94fd78cbd0d3ef0c4dd3678262126b6ed2847b..653ba98a1b69f25b781f8794c7d2ae8c5445cfa6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -884,7 +884,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -912,7 +912,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
              return EntityCategory.WATER;
          }
  
@@ -271,13 +307,13 @@ index 7ef5980f7321662aa7034a74c2f6926846425db9..00200576bad5a92c65df762239dbec9a
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 5402098dce0d64d3dceea51f248d7d366850a74f..c49bed43a34549936b5751678f2389c2d9a6e1ec 100644
+index 7902c649a54fccbb13531c01e052df87ec4a424a..e8f50fdd7791fa8acc6eccdef40349845696b357 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -504,7 +504,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -501,7 +501,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
+                 // 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
                  // We don't need to parse pending
@@ -320,11 +356,24 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..0e695ea608c4e4770f5491d54ad47616
      }
 +    // Plazma end
  }
+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 62ad4c6ad417e11e9152f74636b2ff0d187d0799..562baddc030c6a7861f58438a630cfbe47847d38 100644
+index 3633574e112f217b412217dd243a631dc4e9c40c..d0d31002562e728fa1a6c9bc81baa4534f11d365 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -227,7 +227,7 @@ public class PurpurConfig {
+@@ -231,7 +231,7 @@ public class PurpurConfig {
          deathMessageOnlyBroadcastToAffectedPlayer = getBoolean("settings.broadcasts.death.only-broadcast-to-affected-player", deathMessageOnlyBroadcastToAffectedPlayer);
      }
  
@@ -334,18 +383,9 @@ index 62ad4c6ad417e11e9152f74636b2ff0d187d0799..562baddc030c6a7861f58438a630cfbe
          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 a810bfd3b8d6bd4d8f2ef8797e4281ae4fe8a67f..a7017a0f8326e307397d357774d39216e525bdd8 100644
+index 5fc8cc40ab627eba0b2110c73d31af213a935733..969ac1b2f824af361beec4afa00b15f13f6868ce 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -96,7 +96,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
- 
-     private WatchdogThread(long timeoutTime, boolean restart)
-     {
--        super( "Watchdog Thread" ); // Purpur - use a generic name
-+        super( "Plazma Watchdog Thread" ); // Purpur - use a generic name // Plazma
-         this.timeoutTime = timeoutTime;
-         this.restart = restart;
-         earlyWarningEvery = Math.min(io.papermc.paper.configuration.GlobalConfiguration.get().watchdog.earlyWarningEvery, timeoutTime); // Paper
 @@ -155,14 +155,14 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
                  if (isLongTimeout) {
                  // Paper end
@@ -360,7 +400,7 @@ index a810bfd3b8d6bd4d8f2ef8797e4281ae4fe8a67f..a7017a0f8326e307397d357774d39216
 +                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, "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
++                log.log( Level.SEVERE, "Plazma version: " + Bukkit.getServer().getVersion() ); // Purpur // Plazma
                  //
                  if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
                  {

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

@@ -1,75 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Fri, 24 Mar 2023 23:54:51 +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..067bcbcb81802a3a52ecff737ddf2c033696ecfb 100644
---- a/src/main/java/com/destroystokyo/paper/Metrics.java
-+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
-@@ -636,12 +636,63 @@ public class Metrics {
-                     return map;
-                 }));
- 
-+                // Plazma start
-+                metrics.addCustomChart(new Metrics.DrilldownPie("datapacks", () -> {
-+                    Map<String, Map<String, Integer>> map = new HashMap<>();
-+                    int datapacks = Bukkit.getServer().getDatapackManager().getEnabledPacks().size();
-+                    Map<String, Integer> entry = new HashMap<>();
-+                    entry.put(String.valueOf(datapacks), 1);
-+
-+                    if (datapacks == 0)
-+                        map.put("0", entry);
-+                    else if (datapacks <= 5)
-+                        map.put("1-5", entry);
-+                    else if (datapacks <= 10)
-+                        map.put("6-10", entry);
-+                    else if (datapacks <= 25)
-+                        map.put("11-25", entry);
-+                    else
-+                        map.put("26+", entry);
-+
-+                    return map;
-+                }));
-+                
-+                List<Plugin> plugins = new ArrayList<>();
-+                for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
-+                    if (plugin.isEnabled()) {
-+                        plugins.add(plugin);
-+                    }
-+                }
-+
-+                metrics.addCustomChart(new Metrics.DrilldownPie("plugins", () -> {
-+                    Map<String, Map<String, Integer>> map = new HashMap<>();
-+                    int plugins1 = plugins.size();
-+                    Map<String, Integer> entry = new HashMap<>();
-+                    entry.put(String.valueOf(plugins1), 1);
-+
-+                    if (plugins1 == 0)
-+                        map.put("0", entry);
-+                    else if (plugins1 <= 5)
-+                        map.put("1-5", entry);
-+                    else if (plugins1 <= 10)
-+                        map.put("6-10", entry);
-+                    else if (plugins1 <= 25)
-+                        map.put("11-25", entry);
-+                    else if (plugins1 <= 50)
-+                        map.put("26-50", entry);
-+                    else
-+                        map.put("51+", entry);
-+
-+                    return map;
-+                }));
-+                // 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()) {
-+                    for (Plugin plugin : plugins) { // Plazma
-                         if (CraftMagicNumbers.isLegacy(plugin.getDescription())) {
-                             legacy++;
-                         }

patches/server/0008-Optimize-Default-Configurations.patch

@@ -1,461 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: IPECTER <ipectert@gmail.com>
-Date: Tue, 7 Mar 2023 12:28:34 +0900
-Subject: [PATCH] Optimize Default Configurations
-
-Original: YouHaveTrouble/minecraft-optimization, AkiraDevelopment/SimplyMC
-Copyright (C) 2023 YouHaveTrouble, AkiraDevelopment
-
-diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-index 47e77541e558e18758ae0fcc2aa4e47261e928b6..dd3a29c49392910a38be14a638c6c9b6e825d772 100644
---- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-@@ -211,8 +211,8 @@ public class PufferfishConfig {
-     public static int maxProjectileLoadsPerTick;
-     public static int maxProjectileLoadsPerProjectile;
-     private static void projectileLoading() {
--        maxProjectileLoadsPerTick = getInt("projectile.max-loads-per-tick", 10, "Controls how many chunks are allowed", "to be sync loaded by projectiles in a tick.");
--        maxProjectileLoadsPerProjectile = getInt("projectile.max-loads-per-projectile", 10, "Controls how many chunks a projectile", "can load in its lifetime before it gets", "automatically removed.");
-+		maxProjectileLoadsPerTick = getInt("projectile.max-loads-per-tick", Boolean.getBoolean("Plazma.disableConfigOptimization") ? 10 : 8, "Controls how many chunks are allowed", "to be sync loaded by projectiles in a tick."); // Plazma
-+		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");
-     }
-@@ -225,16 +225,16 @@ public class PufferfishConfig {
-     public static int activationDistanceMod;
- 
-     private static void dynamicActivationOfBrains() throws IOException {
--        dearEnabled = getBoolean("dab.enabled", "activation-range.enabled", false); // Purpur
--        startDistance = getInt("dab.start-distance", "activation-range.start-distance", 12,
-+		dearEnabled = getBoolean("dab.enabled", "activation-range.enabled", !Boolean.getBoolean("Plazma.disableConfigOptimization")); // Purpur // Plazma
-+		startDistance = getInt("dab.start-distance", "activation-range.start-distance", 12,
-                 "This value determines how far away an entity has to be",
-                 "from the player to start being effected by DEAR.");
-         startDistanceSquared = startDistance * startDistance;
-         maximumActivationPrio = getInt("dab.max-tick-freq", "activation-range.max-tick-freq", 20,
-                 "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,
--                "This value defines how much distance modifies an entity's",
-+		activationDistanceMod = getInt("dab.activation-dist-mod", "activation-range.activation-dist-mod", Boolean.getBoolean("Plazma.disableConfigOptimization") ? 8 : 7, // Plazma
-+				"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.",
-                 "If you want further away entities to tick more often, try 9.");
-@@ -269,7 +269,7 @@ public class PufferfishConfig {
-     
-     public static boolean throttleInactiveGoalSelectorTick;
- 	private static void inactiveGoalSelectorThrottle() {
--		getBoolean("inactive-goal-selector-throttle", "inactive-goal-selector-disable", false, // Purpur
-+		getBoolean("inactive-goal-selector-throttle", "inactive-goal-selector-disable", !Boolean.getBoolean("Plazma.disableConfigOptimization"), // Purpur // Plazma
- 				"Throttles the AI goal selector in entity inactive ticks.",
- 				"This can improve performance by a few percent, but has minor gameplay implications.");
- 	}
-diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 8d442c5a498ecf288a0cc0c54889c6e2fda849ce..205ce3456a3f6d28cc2c7cbc131ec0f63a461527 100644
---- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -103,7 +103,7 @@ public class GlobalConfiguration extends ConfigurationPart {
- 
-     public class Watchdog extends ConfigurationPart {
-         public int earlyWarningEvery = 5000;
--        public int earlyWarningDelay = 10000;
-+        public int earlyWarningDelay = Boolean.getBoolean("Plazma.disableConfigOptimization") ? 10000 : 180000; // Plazma - Optimize Default Configurations
-     }
- 
-     public SpamLimiter spamLimiter;
-diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-index a33de97340f14219291c4175e9194914cdf441db..f63b4ab2057176d4f1549200eef16e71c6018dc2 100644
---- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-+++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-@@ -84,15 +84,15 @@ public class WorldConfiguration extends ConfigurationPart {
- 
-         public class AntiXray extends ConfigurationPart {
-             public boolean enabled = false;
--            public EngineMode engineMode = EngineMode.HIDE;
-+            public EngineMode engineMode = Boolean.getBoolean("Plazma.disableConfigOptimization") ? EngineMode.HIDE : EngineMode.OBFUSCATE_LAYER; // Plazma - Optimize Default Configurations
-             public int maxBlockHeight = 64;
-             public int updateRadius = 2;
-             public boolean lavaObscures = false;
-             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>
-+            // Plazma start - Optimize Default Configurations
-+            public List<String> hiddenBlocks = List.of("air", "copper_ore", "deepslate_copper_ore", "raw_copper_block", "diamond_ore", "deepslate_diamond_ore", "gold_ore", "deepslate_gold_ore", "iron_ore", "deepslate_iron_ore", "raw_iron_block", "lapis_ore", "deepslate_lapis_ore", "redstone_ore", "deepslate_redstone_ore"); // TODO update type to List<Block>
-+            public List<String> replacementBlocks = List.of("chest", "amethyst_block", "andesite", "budding_amethyst", "calcite", "coal_ore", "deepslate_coal_ore", "deepslate", "diorite", "dirt", "emerald_ore", "deepslate_emerald_ore", "granite", "gravel", "oak_planks", "smooth_basalt", "stone", "tuff"); // TODO update type to List<Block>
-+            // Plazma end
-         }
-     }
- 
-@@ -139,7 +139,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(), Boolean.getBoolean("Plazma.disableConfigOptimization") ? category.getDespawnDistance() : (net.minecraft.server.MinecraftServer.getServer().server.getSimulationDistance() * 16) + 8))); // Plazma - Optimize Default Configurations
- 
-             @ConfigSerializable
-             public record DespawnRange(@Required int soft, @Required int hard) {
-@@ -323,7 +323,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 = !Boolean.getBoolean("Plazma.disableConfigOptimization"); // Plazma - Optimize Default Configurations
-         public boolean disableExplosionKnockback = false;
-         public boolean generateFlatBedrock = false;
-         public FrostedIce frostedIce;
-@@ -403,9 +403,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 = !Boolean.getBoolean("Plazma.disableConfigOptimization"); // Plazma - Optimize Default Configurations
-         @RequiresSpigotInitialization(MaxEntityCollisionsInitializer.class)
--        public int maxEntityCollisions = 8;
-+        public int maxEntityCollisions = Boolean.getBoolean("Plazma.disableConfigOptimization") ? 8 : 2; // Plazma - Optimize Default Configurations
-         public boolean allowPlayerCrammingDamage = false;
-     }
- 
-@@ -413,18 +413,40 @@ public class WorldConfiguration extends ConfigurationPart {
- 
-     public class Chunks extends ConfigurationPart {
-         public AutosavePeriod autoSaveInterval = AutosavePeriod.def();
--        public int maxAutoSaveChunksPerTick = 24;
-+        public int maxAutoSaveChunksPerTick = Boolean.getBoolean("Plazma.disableConfigOptimization") ? 24 : 8; // Plazma - Optimize Default Configurations
-         public int fixedChunkInhabitedTime = -1;
--        public boolean preventMovingIntoUnloadedChunks = false;
-+        public boolean preventMovingIntoUnloadedChunks = !Boolean.getBoolean("Plazma.disableConfigOptimization"); // 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.put(EntityType.EXPERIENCE_ORB, -1);
--            map.put(EntityType.SNOWBALL, -1);
--            map.put(EntityType.ENDER_PEARL, -1);
--            map.put(EntityType.ARROW, -1);
--            map.put(EntityType.FIREBALL, -1);
--            map.put(EntityType.SMALL_FIREBALL, -1);
-+            // Plazma start - Optimize Default Configurations
-+            if (!Boolean.getBoolean("Plazma.disableConfigOptimization")) {
-+                map.put(EntityType.AREA_EFFECT_CLOUD, 8);
-+                map.put(EntityType.ARROW, 16);
-+                map.put(EntityType.DRAGON_FIREBALL, 3);
-+                map.put(EntityType.EGG, 8);
-+                map.put(EntityType.ENDER_PEARL, 8);
-+                map.put(EntityType.EXPERIENCE_BOTTLE, 3);
-+                map.put(EntityType.EXPERIENCE_ORB, 16);
-+                map.put(EntityType.EYE_OF_ENDER, 8);
-+                map.put(EntityType.FIREBALL, 8);
-+                map.put(EntityType.FIREWORK_ROCKET, 8);
-+                map.put(EntityType.LLAMA_SPIT, 3);
-+                map.put(EntityType.POTION, 8);
-+                map.put(EntityType.SHULKER_BULLET, 8);
-+                map.put(EntityType.SMALL_FIREBALL, 8);
-+                map.put(EntityType.SNOWBALL, 8);
-+                map.put(EntityType.SPECTRAL_ARROW, 16);
-+                map.put(EntityType.TRIDENT, 16);
-+                map.put(EntityType.WITHER_SKULL, 4);
-+            } else {
-+                map.put(EntityType.EXPERIENCE_ORB, -1);
-+                map.put(EntityType.SNOWBALL, -1);
-+                map.put(EntityType.ENDER_PEARL, -1);
-+                map.put(EntityType.ARROW, -1);
-+                map.put(EntityType.FIREBALL, -1);
-+                map.put(EntityType.SMALL_FIREBALL, -1);
-+            }
-+            // Plazma end
-         });
-         public boolean flushRegionsOnSave = false;
-     }
-@@ -439,9 +461,9 @@ public class WorldConfiguration extends ConfigurationPart {
-     public TickRates tickRates;
- 
-     public class TickRates extends ConfigurationPart {
--        public int grassSpread = 1;
-+        public int grassSpread = Boolean.getBoolean("Plazma.disableConfigOptimization") ? 1 : 4; // Plazma - Optimize Default Configurations
-         public int containerUpdate = 1;
--        public int mobSpawner = 1;
-+        public int mobSpawner = Boolean.getBoolean("Plazma.disableConfigOptimization") ? 1 : 2; // Plazma - Optimize Default Configurations
-         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));
-     }
-@@ -465,9 +487,9 @@ public class WorldConfiguration extends ConfigurationPart {
- 
-     public class Misc extends ConfigurationPart {
-         public int lightQueueSize = 20;
--        public boolean updatePathfindingOnBlockUpdate = true;
-+        public boolean updatePathfindingOnBlockUpdate = Boolean.getBoolean("Plazma.disableConfigOptimization"); // Plazma - Optimize Default Configurations
-         public boolean showSignClickCommandFailureMsgsToPlayer = false;
--        public RedstoneImplementation redstoneImplementation = RedstoneImplementation.VANILLA;
-+        public RedstoneImplementation redstoneImplementation = Boolean.getBoolean("Plazma.disableConfigOptimization") ? RedstoneImplementation.VANILLA : RedstoneImplementation.ALTERNATE_CURRENT; // 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..18bc271a34ffba8c83743fef7eaf4a2c1a2bfdec 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 (!Boolean.getBoolean("Plazma.disableConfigOptimization")) 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 5ed7acb332b8982a724e5002e12f18fe32dd4dd4..8a10f9b7b837c4d20eaf4a83827e36f14a180ea7 100644
---- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
-@@ -154,7 +154,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(Boolean.getBoolean("Plazma.disableConfigOptimization") ? "configurations/bukkit.yml" : "configurations/bukkit_optimized.yml"), Charsets.UTF_8))); // Plazma - Optimize Default Configurations
-                 configuration.save(configFile);
- 
-                 File commandFile = (File) optionset.valueOf("commands-settings");
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index 1ea3012995c738c67b31e997c138f824f9e69ba1..8ed00a650b712cbf4bc8796165a539d76d390d0f 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-@@ -120,7 +120,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
-         this.levelName = this.get("level-name", "world");
-         this.serverPort = this.get("server-port", 25565);
-         this.announcePlayerAchievements = this.getLegacyBoolean("announce-player-achievements");
--        this.enableQuery = this.get("enable-query", false);
-+        this.enableQuery = this.get("enable-query", !Boolean.getBoolean("Plazma.disableConfigOptimization")); // Plazma - Optimize Default Configurations
-         this.queryPort = this.get("query.port", 25565);
-         this.enableRcon = this.get("enable-rcon", false);
-         this.rconPort = this.get("rcon.port", 25575);
-@@ -129,15 +129,15 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
-         this.allowNether = this.get("allow-nether", true);
-         this.spawnMonsters = this.get("spawn-monsters", true);
-         this.useNativeTransport = this.get("use-native-transport", true);
--        this.enableCommandBlock = this.get("enable-command-block", false);
--        this.spawnProtection = this.get("spawn-protection", 16);
-+        this.enableCommandBlock = this.get("enable-command-block", !Boolean.getBoolean("Plazma.disableConfigOptimization")); // Plazma - Optimize Default Configurations
-+        this.spawnProtection = this.get("spawn-protection", Boolean.getBoolean("Plazma.disableConfigOptimization") ? 16 : 0); // 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.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", Boolean.getBoolean("Plazma.disableConfigOptimization") ? 10 : 7); // Plazma - Optimize Default Configurations
-+        this.simulationDistance = this.get("simulation-distance", Boolean.getBoolean("Plazma.disableConfigOptimization") ? 10 : 4); // 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);
-@@ -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 = Boolean.getBoolean("Paper.enable-sync-chunk-writes"); // Paper - hide behind flag // Plazma - Optimize Default Configurations
-         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 bb5ec38711f369ffcbd184b4e144bc0d8d576013..5df6fd278a6555e483ea4ebc4e9625907585f77f 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -349,7 +349,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(Boolean.getBoolean("Plazma.disableConfigOptimization") ? "configurations/bukkit.yml" : "configurations/bukkit_optimized.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/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 562baddc030c6a7861f58438a630cfbe47847d38..529247dad9300b0abc024464fb0ca35c4bc0f410 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -49,7 +49,10 @@ public class PurpurConfig {
-             + "join us in our Discord guild.\n"
-             + "\n"
-             + "Website: https://purpurmc.org \n"
--            + "Docs: https://purpurmc.org/docs \n";
-+            // Plazma start
-+            + "Docs: https://purpurmc.org/docs \n"
-+            + "Vanilla Food Properties: https://gist.github.com/BillyGalbreath/4fdfba991bd020e814eabf5143e3b225 \n";
-+            // Plazma end
-     private static File CONFIG_FILE;
-     public static YamlConfiguration config;
- 
-@@ -237,7 +240,7 @@ public class PurpurConfig {
-         laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
-     }
- 
--    public static boolean useAlternateKeepAlive = false;
-+    public static boolean useAlternateKeepAlive = !Boolean.getBoolean("Plazma.disableConfigOptimization"); // Plazma - Optimize Default Configurations
-     private static void useAlternateKeepAlive() {
-         useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
-     }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 0db8a1a51c857a3930d0b20028964fb355d8e5b4..aca570efe2360d7d5f71e62433f6b1cd08f5214b 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -425,7 +425,7 @@ public class PurpurWorldConfig {
-     public boolean playerInvulnerableWhileAcceptingResourcePack = false;
-     public String playerDeathExpDropEquation = "expLevel * 7";
-     public int playerDeathExpDropMax = 100;
--    public boolean teleportIfOutsideBorder = false;
-+    public boolean teleportIfOutsideBorder = !Boolean.getBoolean("Plazma.disableConfigOptimization"); // Plazma - Optimize Default Configurations
-     public boolean teleportOnNetherCeilingDamage = false;
-     public boolean totemOfUndyingWorksInInventory = false;
-     public boolean playerFixStuckPortal = false;
-@@ -3038,7 +3038,7 @@ public class PurpurWorldConfig {
-     public boolean zombieJockeyOnlyBaby = true;
-     public double zombieJockeyChance = 0.05D;
-     public boolean zombieJockeyTryExistingChickens = true;
--    public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
-+    public boolean zombieAggressiveTowardsVillagerWhenLagging = Boolean.getBoolean("Plazma.disableConfigOptimization"); // 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 bbfafb1400721251dfd2cac4dd8a31be2d682d4b..f61aca65f9d9bc6888285def1c9016f7a7395919 100644
---- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
-+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -148,14 +148,14 @@ public class SpigotWorldConfig
-     public double itemMerge;
-     private void itemMerge()
-     {
--        this.itemMerge = this.getDouble("merge-radius.item", 2.5 );
-+        this.itemMerge = this.getDouble("merge-radius.item", Boolean.getBoolean("Plazma.disableConfigOptimization") ? 2.5 : 3.5 ); // Plazma - Optimize Default Configurations
-         this.log( "Item Merge Radius: " + this.itemMerge );
-     }
- 
-     public double expMerge;
-     private void expMerge()
-     {
--        this.expMerge = this.getDouble("merge-radius.exp", 3.0 );
-+        this.expMerge = this.getDouble("merge-radius.exp", Boolean.getBoolean("Plazma.disableConfigOptimization") ? 3.0 : 4.0 ); // Plazma - Optimize Default Configurations
-         this.log( "Experience Merge Radius: " + this.expMerge );
-     }
- 
-@@ -194,7 +194,7 @@ public class SpigotWorldConfig
-     public byte mobSpawnRange;
-     private void mobSpawnRange()
-     {
--        this.mobSpawnRange = (byte) getInt( "mob-spawn-range", 8 ); // Paper - Vanilla
-+        this.mobSpawnRange = (byte) getInt( "mob-spawn-range", Boolean.getBoolean("Plazma.disableConfigOptimization") ? 8 : 3 ); // Paper - Vanilla // Plazma - Optimize Default Configurations
-         this.log( "Mob Spawn Range: " + this.mobSpawnRange );
-     }
- 
-@@ -205,26 +205,26 @@ public class SpigotWorldConfig
-         this.log( "Item Despawn Rate: " + this.itemDespawnRate );
-     }
- 
--    public int animalActivationRange = 32;
--    public int monsterActivationRange = 32;
-+    public int animalActivationRange = Boolean.getBoolean("Plazma.disableConfigOptimization") ? 32 : 16; // Plazma - Optimize Default Configurations
-+    public int monsterActivationRange = Boolean.getBoolean("Plazma.disableConfigOptimization") ? 32 : 24; // Plazma - Optimize Default Configurations
-     public int raiderActivationRange = 48;
--    public int miscActivationRange = 16;
-+    public int miscActivationRange = Boolean.getBoolean("Plazma.disableConfigOptimization") ? 16 : 8; // Plazma - Optimize Default Configurations
-     // Paper start
--    public int flyingMonsterActivationRange = 32;
--    public int waterActivationRange = 16;
--    public int villagerActivationRange = 32;
-+    public int flyingMonsterActivationRange = Boolean.getBoolean("Plazma.disableConfigOptimization") ? 32 : 48; // Plazma - Optimize Default Configurations
-+    public int waterActivationRange = Boolean.getBoolean("Plazma.disableConfigOptimization") ? 16 : 8; // Plazma - Optimize Default Configurations
-+    public int villagerActivationRange = Boolean.getBoolean("Plazma.disableConfigOptimization") ? 32 : 16; // 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 = Boolean.getBoolean("Plazma.disableConfigOptimization") ? 5*20 : 40; // Plazma - Optimize Default Configurations
-+    public int wakeUpInactiveMonsters = Boolean.getBoolean("Plazma.disableConfigOptimization") ? 8 : 4; // Plazma - Optimize Default Configurations
-     public int wakeUpInactiveMonstersEvery = 20*20;
--    public int wakeUpInactiveMonstersFor = 5*20;
--    public int wakeUpInactiveVillagers = 4;
-+    public int wakeUpInactiveMonstersFor = Boolean.getBoolean("Plazma.disableConfigOptimization") ? 5*20 : 60; // Plazma - Optimize Default Configurations
-+    public int wakeUpInactiveVillagers = Boolean.getBoolean("Plazma.disableConfigOptimization") ? 4 : 1; // Plazma - Optimize Default Configurations
-     public int wakeUpInactiveVillagersEvery = 30*20;
--    public int wakeUpInactiveVillagersFor = 5*20;
--    public int wakeUpInactiveFlying = 8;
-+    public int wakeUpInactiveVillagersFor = Boolean.getBoolean("Plazma.disableConfigOptimization") ? 5*20 : 20; // Plazma - Optimize Default Configurations
-+    public int wakeUpInactiveFlying = Boolean.getBoolean("Plazma.disableConfigOptimization") ? 8 : 1; // Plazma - Optimize Default Configurations
-     public int wakeUpInactiveFlyingEvery = 10*20;
--    public int wakeUpInactiveFlyingFor = 5*20;
-+    public int wakeUpInactiveFlyingFor = Boolean.getBoolean("Plazma.disableConfigOptimization") ? 5*20 : 60; // Plazma - Optimize Default Configurations
-     public int villagersWorkImmunityAfter = 5*20;
-     public int villagersWorkImmunityFor = 20;
-     public boolean villagersActiveForPanic = true;
-@@ -297,7 +297,7 @@ public class SpigotWorldConfig
-         {
-             this.set( "ticks-per.hopper-check", 1 );
-         }
--        this.hopperCheck = this.getInt( "ticks-per.hopper-check", 1 );
-+        this.hopperCheck = this.getInt( "ticks-per.hopper-check", Boolean.getBoolean("Plazma.disableConfigOptimization") ? 1 : 8 ); // 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 );
-@@ -307,7 +307,7 @@ public class SpigotWorldConfig
-     public int tridentDespawnRate;
-     private void arrowDespawnRate()
-     {
--        this.arrowDespawnRate = this.getInt( "arrow-despawn-rate", 1200 );
-+        this.arrowDespawnRate = this.getInt( "arrow-despawn-rate", Boolean.getBoolean("Plazma.disableConfigOptimization") ? 1200 : 300 ); // 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 );
-     }
-diff --git a/src/main/resources/configurations/bukkit_optimized.yml b/src/main/resources/configurations/bukkit_optimized.yml
-new file mode 100644
-index 0000000000000000000000000000000000000000..eb33b0a19d6060f78d7ead7a2ad63b1b2581293d
---- /dev/null
-+++ b/src/main/resources/configurations/bukkit_optimized.yml
-@@ -0,0 +1,45 @@
-+# This is the main configuration file for Bukkit.
-+# As you can see, there's actually not that much to configure without any plugins.
-+# For a reference for any variable inside this file, check out the Bukkit Wiki at
-+# https://www.spigotmc.org/go/bukkit-yml
-+# 
-+# If you need help on this file, feel free to join us on Discord or leave a message
-+# on the forums asking for advice.
-+# 
-+# Discord: https://www.spigotmc.org/go/discord
-+# Forums: https://www.spigotmc.org/
-+# Bug tracker: https://www.spigotmc.org/go/bugs
-+
-+
-+settings:
-+    allow-end: true
-+    warn-on-overload: true
-+    permissions-file: permissions.yml
-+    update-folder: update
-+    plugin-profiling: false
-+    connection-throttle: 4000
-+    query-plugins: true
-+    deprecated-verbose: default
-+    shutdown-message: Server closed
-+    minimum-api: none
-+    use-map-color-cache: true
-+spawn-limits:
-+    monsters: 20
-+    animals: 5
-+    water-animals: 2
-+    water-ambient: 2
-+    water-underground-creature: 3
-+    axolotls: 3
-+    ambient: 1
-+chunk-gc:
-+    period-in-ticks: 400
-+ticks-per:
-+    animal-spawns: 400
-+    monster-spawns: 10
-+    water-spawns: 400
-+    water-ambient-spawns: 400
-+    water-underground-creature-spawns: 400
-+    axolotl-spawns: 400
-+    ambient-spawns: 400
-+    autosave: 6000
-+aliases: now-in-commands.yml

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

@@ -0,0 +1,71 @@
+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..5875aae8d7d0146ef9903d8b4bc2b673a615fd98 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+@@ -23,4 +23,23 @@ 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 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/0009-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 ce45a93fe835fd1ea4411c78df430aaa903c83c3..9b8bdffbbfe45c6712d0f4da3643424fa94fc69e 100644
+--- a/src/main/java/net/minecraft/server/Main.java
++++ b/src/main/java/net/minecraft/server/Main.java
+@@ -178,6 +178,7 @@ public class Main {
+ 
+             // Spigot Start
+             boolean eulaAgreed = Boolean.getBoolean( "com.mojang.eula.agree" );
++            eulaAgreed = eulaAgreed || Boolean.getBoolean("Paper.isRunDev"); // Plazma
+             if ( eulaAgreed )
+             {
+                 System.err.println( "You have used the Spigot command line EULA agreement flag." );

patches/server/0009-ChunkSending-Configuration.patch

@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: IPECTER <ipectert@gmail.com>
-Date: Thu, 23 Mar 2023 14:25:09 +0900
-Subject: [PATCH] ChunkSending Configuration
-
-
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 857ddc62dd9affbbebcd7cde8a6d675dbb5f68ae..8ba1c5b6731d43c02b415e4d79a20c1de0c03ad5 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-@@ -22,4 +22,12 @@ public class LevelConfigurations extends ConfigurationPart {
- 
-     @Setting(Configuration.VERSION_FIELD)
-     public int version = CURRENT_VERSION;
-+
-+    public ChunkSending chunkSending;
-+    public class ChunkSending extends ConfigurationPart {
-+
-+        public boolean enabled = true;
-+        public int maxChunksPerTick = 5;
-+
-+    }
- }

patches/server/0010-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 7d80d2cf5d607d6051e99e4b08bc1b76098a79da..057fb0be810930b1d1a18d7d572c18ac066ac849 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/0010-Implement-ChunkSending.patch

@@ -1,90 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: IPECTER <ipectert@gmail.com>
-Date: Thu, 23 Mar 2023 14:32:26 +0900
-Subject: [PATCH] Implement ChunkSending
-
-Original: someaddons/chunksending
-Copyright (C) 2023 someaddons
-
-diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index 904fcdeb7937d36208cc9a8d5eca9ef3a5b2cd9e..7f749579fe056a8436e6625204ae31f1fcc15f32 100644
---- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-@@ -362,15 +362,14 @@ public class ChunkHolder {
-         }
- 
-         Object[] backingSet = players.getBackingSet();
--        for (int i = 0, len = backingSet.length; i < len; ++i) {
--            if (!(backingSet[i] instanceof ServerPlayer player)) {
--                continue;
--            }
--            if (!this.chunkMap.playerChunkManager.isChunkSent(player, this.pos.x, this.pos.z, onlyOnWatchDistanceEdge)) {
--                continue;
--            }
-+        // Plazma start - Implement ChunkSending
-+        for (Object o : backingSet) {
-+            if (!(o instanceof ServerPlayer player)
-+                    || !this.chunkMap.playerChunkManager.isChunkSent(player, this.pos.x, this.pos.z, onlyOnWatchDistanceEdge)
-+                    || (this.chunkMap.level.plazmaLevelConfiguration().chunkSending.enabled && player.attachToPending(pos, packet))) continue;
-             player.connection.send(packet);
-         }
-+        // Plazma end
-         // Paper end - per player view distance
-     }
- 
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 82402be7bbbf04388339c6a471946a72f09dfe3b..40eda117db2e3f578ad9d25522b6aadfe319b5cc 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -730,8 +730,36 @@ public class ServerPlayer extends Player {
-             }
-         }
-         // Purpur end
-+    // Plazma start - Implement ChunkSending
-+        if (this.level.plazmaLevelConfiguration().chunkSending.enabled) {
-+            if (chunksToSend.isEmpty()) return;
-+
-+            if (disconnected) {
-+                chunksToSend.clear();
-+                return;
-+            }
-+
-+            final List<java.util.Map.Entry<ChunkPos, List<Packet<?>>>> packets = new java.util.ArrayList<>(chunksToSend.entrySet());
-+            packets.sort(java.util.Comparator.comparingDouble(e -> e.getKey().getMiddleBlockPosition(getBlockY()).distSqr(blockPosition())));
-+
-+            for (int i = 0; i < packets.size() && i < this.level.plazmaLevelConfiguration().chunkSending.maxChunksPerTick; i++) {
-+                final java.util.Map.Entry<ChunkPos, List<Packet<?>>> entry = packets.get(i);
-+                for (final Packet<?> packet : entry.getValue()) {
-+                    connection.send(packet);
-+                }
-+                chunksToSend.remove(entry.getKey());
-+            }
-+        }
-     }
- 
-+    public boolean attachToPending(final ChunkPos pos, final Packet<?> packet) {
-+        final List<Packet<?>> packetList = chunksToSend.get(pos);
-+        if (packetList == null) return false;
-+        packetList.add(packet);
-+        return true;
-+    }
-+    // Plazma end
-+
-     public void doTick() {
-         try {
-             if (valid && !this.isSpectator() || !this.touchingUnloadedChunk()) { // Paper - don't tick dead players that are not in the world currently (pending respawn)
-@@ -2369,7 +2397,14 @@ public class ServerPlayer extends Player {
-         return true; // Paper
-     }
- 
-+    // Plazma start - Implement ChunkSending
-+    private final java.util.Map<ChunkPos, List<Packet<?>>> chunksToSend = java.util.Collections.synchronizedMap(new java.util.HashMap<>());
-     public void trackChunk(ChunkPos chunkPos, Packet<?> chunkDataPacket) {
-+        if (this.level.plazmaLevelConfiguration().chunkSending.enabled) {
-+            List<Packet<?>> packetList = chunksToSend.computeIfAbsent(chunkPos, k -> new java.util.ArrayList<>());
-+            packetList.add(chunkDataPacket);
-+        }
-+    // Plazma end
-         this.connection.send(chunkDataPacket);
-         // Paper start
-         if(io.papermc.paper.event.packet.PlayerChunkLoadEvent.getHandlerList().getRegisteredListeners().length > 0){

patches/server/0011-Console-Log-Configuration.patch

@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <alphakr93@gmail.com>
-Date: Fri, 10 Mar 2023 20:35:27 +0900
-Subject: [PATCH] Console Log Configuration
-
-
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 6714947455c1e4c887a5f13ba1a3aeb57324ee0a..3c70653b720d3d55be199e000e89c627b90e65da 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -20,4 +20,10 @@ public class GlobalConfiguration extends ConfigurationPart {
- 
-     @Setting(Configuration.VERSION_FIELD)
-     public int version = CURRENT_VERSION;
-+
-+    public ConsoleLogs consoleLogs;
-+    public class ConsoleLogs extends ConfigurationPart {
-+
-+
-+    }
- }

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

@@ -0,0 +1,599 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+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
+- 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 9ca1494497ae53e56b1f81fda51b0b8bd02a6d03..97b1366d25537d68469e95ac101b1b8cf9fdc997 100644
+--- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
++++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
+@@ -64,7 +64,7 @@ public class PufferfishConfig {
+ 		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 - Nope
+ 				"Join our Discord for support: https://discord.gg/reZw4vQV9H",
+ 				"Download new builds at https://ci.pufferfish.host/job/Pufferfish");
+ 		
+@@ -211,7 +211,7 @@ public class PufferfishConfig {
+     public static int maxProjectileLoadsPerTick;
+     public static int maxProjectileLoadsPerProjectile;
+     private static void projectileLoading() {
+-        maxProjectileLoadsPerTick = getInt("projectile.max-loads-per-tick", 10, "Controls how many chunks are allowed", "to be sync loaded by projectiles in a tick.");
++        maxProjectileLoadsPerTick = getInt("projectile.max-loads-per-tick", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 8 : 10, "Controls how many chunks are allowed", "to be sync loaded by projectiles in a tick."); // Plazma - Optimize default configurations
+         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");
+@@ -225,7 +225,7 @@ public class PufferfishConfig {
+     public static int activationDistanceMod;
+ 
+     private static void dynamicActivationOfBrains() throws IOException {
+-        dearEnabled = getBoolean("dab.enabled", "activation-range.enabled", false); // Purpur
++        dearEnabled = getBoolean("dab.enabled", "activation-range.enabled", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize()); // Purpur // Plazma - Optimize default configurations
+         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.");
+@@ -233,7 +233,7 @@ public class PufferfishConfig {
+         maximumActivationPrio = getInt("dab.max-tick-freq", "activation-range.max-tick-freq", 20,
+                 "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.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.",
+@@ -253,8 +253,18 @@ public class PufferfishConfig {
+ 	public static Map<String, Integer> projectileTimeouts;
+ 	private static void projectileTimeouts() {
+ 		// Set some defaults
++        // Plazma start - Optimize default configurations
++        if (org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize()) {
++            getInt("entity_timeouts.ARROW", 200);
++            getInt("entity_timeouts.EGG", 200);
++            getInt("entity_timeouts.ENDER_PEARL", 200);
++            getInt("entity_timeouts.SNOWBALL", 200);
++            getInt("entity_timeouts.LLAMA_SPIT", 200);
++        } else {
++        // Plazma end
+ 		getInt("entity_timeouts.SNOWBALL", -1);
+ 		getInt("entity_timeouts.LLAMA_SPIT", -1);
++        } // Plazma
+ 		setComment("entity_timeouts",
+ 				"These values define a entity's maximum lifespan. If an",
+ 				"entity is in this list and it has survived for longer than",
+diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+index a6f58b3457b7477015c5c6d969e7d83017dd3fa1..85e56d726eb7780811e0a990e1ef7d3ec767e36d 100644
+--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
++++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+@@ -155,7 +155,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+ 
+     public class Watchdog extends ConfigurationPart {
+         public int earlyWarningEvery = 5000;
+-        public int earlyWarningDelay = 10000;
++        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 071d3877e386a0c7c4d2f2e8ddd06e0765c49d0d..79e2a6806311c402e481c5b29cbd3ced85101f6e 100644
+--- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
++++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
+@@ -96,12 +96,32 @@ public class WorldConfiguration extends ConfigurationPart {
+ 
+         public class AntiXray extends ConfigurationPart {
+             public boolean enabled = false;
+-            public EngineMode engineMode = EngineMode.HIDE;
++            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 = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize(); // Plazma - Optimize default configurations
+             public boolean usePermission = false;
+-            public List<Block> hiddenBlocks = List.of(
++            // Plazma start - Optimize default configurations
++            public List<Block> hiddenBlocks = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? List.of(
++                    //<editor-fold desc="Anti-Xray Hidden Blocks" defaultstate="collapsed">
++                    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
+         }
+     }
+ 
+@@ -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.optimize() ? (net.minecraft.server.MinecraftServer.getServer().server.getSimulationDistance() * 16) + 8 : category.getDespawnDistance()))); // Plazma - Optimize default configurations
+ 
+             @ConfigSerializable
+             public record DespawnRange(@Required int soft, @Required int hard) {
+@@ -381,7 +422,7 @@ public class WorldConfiguration extends ConfigurationPart {
+     public class Environment extends ConfigurationPart {
+         public boolean disableThunder = false;
+         public boolean disableIceAndSnow = false;
+-        public boolean optimizeExplosions = false;
++        public boolean optimizeExplosions = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize(); // Plazma - Optimize default configurations
+         public boolean disableExplosionKnockback = false;
+         public boolean generateFlatBedrock = false;
+         public FrostedIce frostedIce;
+@@ -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.optimize(); // Plazma - Optimize default configurations
+         public boolean disableUnloadedChunkEnderpearlExploit = true;
+         public boolean preventTntFromMovingInWater = false;
+         public boolean splitOverstackedLoot = true;
+@@ -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.optimize(); // Plazma - Optimize default configurations
+         @RequiresSpigotInitialization(MaxEntityCollisionsInitializer.class)
+-        public int maxEntityCollisions = 8;
++        public int maxEntityCollisions = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 2 : 8; // Plazma - Optimize default configurations
+         public boolean allowPlayerCrammingDamage = false;
+     }
+ 
+@@ -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.optimize() ? 8 : 24; // Plazma - Optimize default configurations
+         public int fixedChunkInhabitedTime = -1;
+-        public boolean preventMovingIntoUnloadedChunks = false;
++        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.put(EntityType.EXPERIENCE_ORB, -1);
+-            map.put(EntityType.SNOWBALL, -1);
+-            map.put(EntityType.ENDER_PEARL, -1);
+-            map.put(EntityType.ARROW, -1);
+-            map.put(EntityType.FIREBALL, -1);
+-            map.put(EntityType.SMALL_FIREBALL, -1);
++            // Plazma start - Optimize default configurations
++            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);
++                map.put(EntityType.EGG, 8);
++                map.put(EntityType.ENDER_PEARL, 8);
++                map.put(EntityType.EXPERIENCE_BOTTLE, 3);
++                map.put(EntityType.EXPERIENCE_ORB, 16);
++                map.put(EntityType.EYE_OF_ENDER, 8);
++                map.put(EntityType.FIREBALL, 8);
++                map.put(EntityType.FIREWORK_ROCKET, 8);
++                map.put(EntityType.LLAMA_SPIT, 3);
++                map.put(EntityType.POTION, 8);
++                map.put(EntityType.SHULKER_BULLET, 8);
++                map.put(EntityType.SMALL_FIREBALL, 8);
++                map.put(EntityType.SNOWBALL, 8);
++                map.put(EntityType.SPECTRAL_ARROW, 16);
++                map.put(EntityType.TRIDENT, 16);
++                map.put(EntityType.WITHER_SKULL, 4);
++            } else {
++                map.put(EntityType.EXPERIENCE_ORB, -1);
++                map.put(EntityType.SNOWBALL, -1);
++                map.put(EntityType.ENDER_PEARL, -1);
++                map.put(EntityType.ARROW, -1);
++                map.put(EntityType.FIREBALL, -1);
++                map.put(EntityType.SMALL_FIREBALL, -1);
++            }
++            // Plazma end
+         });
+         public boolean flushRegionsOnSave = false;
+     }
+@@ -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.optimize() ? 4 : 1; // Plazma - Optimize default configurations
+         public int containerUpdate = 1;
+-        public int mobSpawner = 1;
++        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));
+@@ -525,9 +589,9 @@ public class WorldConfiguration extends ConfigurationPart {
+ 
+     public class Misc extends ConfigurationPart {
+         public int lightQueueSize = 20;
+-        public boolean updatePathfindingOnBlockUpdate = true;
++        public boolean updatePathfindingOnBlockUpdate = !org.plazmamc.plazma.Options.aggressiveOptimize; // Plazma - Optimize default configurations
+         public boolean showSignClickCommandFailureMsgsToPlayer = false;
+-        public RedstoneImplementation redstoneImplementation = RedstoneImplementation.VANILLA;
++        public RedstoneImplementation redstoneImplementation = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? RedstoneImplementation.ALTERNATE_CURRENT : RedstoneImplementation.VANILLA; // Plazma - Optimize default configurations
+         public 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..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.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 9b8bdffbbfe45c6712d0f4da3643424fa94fc69e..84eca01450db5b737c676cab2439d041141c323d 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 {
+                 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.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");
+diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
+index fe82a20efb2b130a568bc06aec5b86d3082062a3..8dddcacec38bf2d5d79ce7fc0f26a2cced5d271d 100644
+--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
+@@ -131,14 +131,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.spawnProtection = this.get("spawn-protection", 16);
++        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", 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.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
+         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.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 6537ae98dc4086f2b6668810425f80c19ef57734..da483bdf81efa62b36b6a10dacc7821b43dd18b7 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -433,7 +433,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(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/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 {
+ 
+     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..f9f7664e4a6a4e24dcb3b8da0a807a984a698429 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 {
+             + "join us in our Discord guild.\n"
+             + "\n"
+             + "Website: https://purpurmc.org \n"
++            + "Vanilla Food Properties: https://gist.github.com/BillyGalbreath/4fdfba991bd020e814eabf5143e3b225 \n" // Plazma
+             + "Docs: https://purpurmc.org/docs \n";
+     private static File CONFIG_FILE;
+     public static YamlConfiguration config;
+@@ -241,7 +242,7 @@ public class PurpurConfig {
+         laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
+     }
+ 
+-    public static boolean useAlternateKeepAlive = false;
++    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);
+     }
+@@ -481,7 +482,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 b9d1117885a8dd15f207e55ce5e402d8cefe0226..9cb79d203b6ec345d719cd488d2cce8f877fe2bd 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+@@ -425,7 +425,7 @@ public class PurpurWorldConfig {
+     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.optimize(); // Plazma - Optimize default configurations
+     public boolean teleportOnNetherCeilingDamage = false;
+     public boolean totemOfUndyingWorksInInventory = false;
+     public boolean playerFixStuckPortal = false;
+@@ -3070,7 +3070,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.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 f9b8e2bc039f1a37e47f84909c8785f3ef530284..576e82d2cf933b307b7374b60d864e98be4afcb2 100644
+--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
++++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
+@@ -150,14 +150,14 @@ public class SpigotWorldConfig
+     public double itemMerge;
+     private void itemMerge()
+     {
+-        this.itemMerge = this.getDouble("merge-radius.item", 2.5 );
++        this.itemMerge = this.getDouble("merge-radius.item", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 3.5 : 2.5 ); // Plazma - Optimize default configurations
+         this.log( "Item Merge Radius: " + this.itemMerge );
+     }
+ 
+     public double expMerge;
+     private void expMerge()
+     {
+-        this.expMerge = this.getDouble("merge-radius.exp", 3.0 );
++        this.expMerge = this.getDouble("merge-radius.exp", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 4.0 : 3.0 ); // Plazma - Optimize default configurations
+         this.log( "Experience Merge Radius: " + this.expMerge );
+     }
+ 
+@@ -196,7 +196,7 @@ public class SpigotWorldConfig
+     public byte mobSpawnRange;
+     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.optimize() ? 3 : 8 ); // Paper - Vanilla // Plazma - Optimize default configurations
+         this.log( "Mob Spawn Range: " + this.mobSpawnRange );
+     }
+ 
+@@ -207,26 +207,26 @@ public class SpigotWorldConfig
+         this.log( "Item Despawn Rate: " + this.itemDespawnRate );
+     }
+ 
+-    public int animalActivationRange = 32;
+-    public int monsterActivationRange = 32;
++    public int animalActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 16 : 32; // Plazma - Optimize default configurations
++    public int monsterActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 24 : 32; // Plazma - Optimize default configurations
+     public int raiderActivationRange = 48;
+-    public int miscActivationRange = 16;
++    public int miscActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 8 : 16; // Plazma - Optimize default configurations
+     // Paper start
+-    public int flyingMonsterActivationRange = 32;
+-    public int waterActivationRange = 16;
+-    public int villagerActivationRange = 32;
++    public int flyingMonsterActivationRange = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? 48 : 32; // Plazma - Optimize default configurations
++    public int 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.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.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.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.optimize() ? 60 : 100; // Plazma - Optimize default configurations
+     public int villagersWorkImmunityAfter = 5*20;
+     public int villagersWorkImmunityFor = 20;
+     public boolean villagersActiveForPanic = true;
+@@ -299,7 +299,7 @@ public class SpigotWorldConfig
+         {
+             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.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 );
+@@ -309,7 +309,7 @@ public class SpigotWorldConfig
+     public int tridentDespawnRate;
+     private void arrowDespawnRate()
+     {
+-        this.arrowDespawnRate = this.getInt( "arrow-despawn-rate", 1200 );
++        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 );
+     }
+diff --git a/src/main/resources/configurations/bukkit_optimized.yml b/src/main/resources/configurations/bukkit_optimized.yml
+new file mode 100644
+index 0000000000000000000000000000000000000000..eb33b0a19d6060f78d7ead7a2ad63b1b2581293d
+--- /dev/null
++++ b/src/main/resources/configurations/bukkit_optimized.yml
+@@ -0,0 +1,45 @@
++# This is the main configuration file for Bukkit.
++# As you can see, there's actually not that much to configure without any plugins.
++# For a reference for any variable inside this file, check out the Bukkit Wiki at
++# https://www.spigotmc.org/go/bukkit-yml
++# 
++# If you need help on this file, feel free to join us on Discord or leave a message
++# on the forums asking for advice.
++# 
++# Discord: https://www.spigotmc.org/go/discord
++# Forums: https://www.spigotmc.org/
++# Bug tracker: https://www.spigotmc.org/go/bugs
++
++
++settings:
++    allow-end: true
++    warn-on-overload: true
++    permissions-file: permissions.yml
++    update-folder: update
++    plugin-profiling: false
++    connection-throttle: 4000
++    query-plugins: true
++    deprecated-verbose: default
++    shutdown-message: Server closed
++    minimum-api: none
++    use-map-color-cache: true
++spawn-limits:
++    monsters: 20
++    animals: 5
++    water-animals: 2
++    water-ambient: 2
++    water-underground-creature: 3
++    axolotls: 3
++    ambient: 1
++chunk-gc:
++    period-in-ticks: 400
++ticks-per:
++    animal-spawns: 400
++    monster-spawns: 10
++    water-spawns: 400
++    water-ambient-spawns: 400
++    water-underground-creature-spawns: 400
++    axolotl-spawns: 400
++    ambient-spawns: 400
++    autosave: 6000
++aliases: now-in-commands.yml

patches/server/0012-Console-log-tweaks.patch

@@ -1,74 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <alphakr93@gmail.com>
-Date: Fri, 10 Mar 2023 21:45:37 +0900
-Subject: [PATCH] Console log tweaks
-
-[Offine Warning Configuration Patch]
-Original by Irochi <me@irochi.moe>
-Licensed under the GPL 3.0
-
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index b91910eaac0e9c18722e52d223a4420199d77a7f..84bb45aef3c2087cb9c03a99184956c484b3d8e9 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
-             DedicatedServer.LOGGER.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
-         }
- 
--        // Paper start - detect running as root
--        if (io.papermc.paper.util.ServerEnvironment.userIsRootOrAdmin()) {
--            DedicatedServer.LOGGER.warn("****************************");
--            DedicatedServer.LOGGER.warn("YOU ARE RUNNING THIS SERVER AS AN ADMINISTRATIVE OR ROOT USER. THIS IS NOT ADVISED.");
--            DedicatedServer.LOGGER.warn("YOU ARE OPENING YOURSELF UP TO POTENTIAL RISKS WHEN DOING THIS.");
--            DedicatedServer.LOGGER.warn("FOR MORE INFORMATION, SEE https://madelinemiller.dev/blog/root-minecraft-server/");
--            DedicatedServer.LOGGER.warn("****************************");
--        }
--        // Paper end
--
-         DedicatedServer.LOGGER.info("Loading properties");
-         DedicatedServerProperties dedicatedserverproperties = this.settings.getProperties();
- 
-@@ -321,7 +311,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 (!this.usesAuthentication()) {
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().consoleLogs.enableOfflineWarnings && !this.usesAuthentication()) { // Plazma
-             DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
-             DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
-             // Spigot start
-@@ -334,9 +324,20 @@ 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 - Moved down
-+        // Paper start - detect running as root
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().consoleLogs.enableRootUserWarnings && io.papermc.paper.util.ServerEnvironment.userIsRootOrAdmin()) {
-+            DedicatedServer.LOGGER.warn("****************************");
-+            DedicatedServer.LOGGER.warn("YOU ARE RUNNING THIS SERVER AS AN ADMINISTRATIVE OR ROOT USER. THIS IS NOT ADVISED.");
-+            DedicatedServer.LOGGER.warn("YOU ARE OPENING YOURSELF UP TO POTENTIAL RISKS WHEN DOING THIS.");
-+            DedicatedServer.LOGGER.warn("FOR MORE INFORMATION, SEE https://madelinemiller.dev/blog/root-minecraft-server/");
-+            DedicatedServer.LOGGER.warn("****************************");
-+        }
-+        // Paper end
-+        // Plazma end
- 
-         if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
-             return false;
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 3c70653b720d3d55be199e000e89c627b90e65da..122482e1fae7d6ac8e6b32ebdcf3e611d47901c4 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -24,6 +24,8 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public ConsoleLogs consoleLogs;
-     public class ConsoleLogs extends ConfigurationPart {
- 
-+        public boolean enableOfflineWarnings = true;
-+        public boolean enableRootUserWarnings = true;
- 
-     }
- }

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

@@ -0,0 +1,96 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Sun, 5 Nov 2023 10:40:49 +0900
+Subject: [PATCH] Tweak console logging
+
+
+diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
+index e4fd372a1d585887287253a02531cd192929377b..6624fb97404c3032d60167e3fb108dcfcd066784 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 - Tweak console logging
+         }
+     }
+ 
+diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+index 00fbcb941fe393197619762722eb51d62fb073c2..770b959d9e51ef0645415d5a0d7d79b7031abd66 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
+             DedicatedServer.LOGGER.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
+         }
+ 
+-        // Paper start - detect running as root
+-        if (io.papermc.paper.util.ServerEnvironment.userIsRootOrAdmin()) {
+-            DedicatedServer.LOGGER.warn("****************************");
+-            DedicatedServer.LOGGER.warn("YOU ARE RUNNING THIS SERVER AS AN ADMINISTRATIVE OR ROOT USER. THIS IS NOT ADVISED.");
+-            DedicatedServer.LOGGER.warn("YOU ARE OPENING YOURSELF UP TO POTENTIAL RISKS WHEN DOING THIS.");
+-            DedicatedServer.LOGGER.warn("FOR MORE INFORMATION, SEE https://madelinemiller.dev/blog/root-minecraft-server/");
+-            DedicatedServer.LOGGER.warn("****************************");
+-        }
+-        // Paper end
+-
+         DedicatedServer.LOGGER.info("Loading properties");
+         DedicatedServerProperties dedicatedserverproperties = this.settings.getProperties();
+ 
+@@ -319,6 +309,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 - 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.");
+@@ -335,6 +326,17 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+             DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
+         }
+ 
++        // Plazma - Moved down - Tweak console logging
++        // Paper start - detect running as root
++        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().consoleLogs.rootUserWarnings && io.papermc.paper.util.ServerEnvironment.userIsRootOrAdmin()) {
++            DedicatedServer.LOGGER.warn("****************************");
++            DedicatedServer.LOGGER.warn("YOU ARE RUNNING THIS SERVER AS AN ADMINISTRATIVE OR ROOT USER. THIS IS NOT ADVISED.");
++            DedicatedServer.LOGGER.warn("YOU ARE OPENING YOURSELF UP TO POTENTIAL RISKS WHEN DOING THIS.");
++            DedicatedServer.LOGGER.warn("FOR MORE INFORMATION, SEE https://madelinemiller.dev/blog/root-minecraft-server/");
++            DedicatedServer.LOGGER.warn("****************************");
++        }
++        // Paper end
++        // Plazma end
+ 
+         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 182acaad79e14e5e120094916a0d295a4584de7a..e8de78f8b7c90a719e10c483991f45a7886256be 100644
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+@@ -1462,6 +1462,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);
++        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 5875aae8d7d0146ef9903d8b4bc2b673a615fd98..51413e828500792cc493b836bb1460a394ff4f75 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+@@ -42,4 +42,13 @@ public class GlobalConfiguration extends ConfigurationPart {
+ 
+     }
+ 
++    public ConsoleLogs consoleLogs;
++    public class ConsoleLogs extends ConfigurationPart {
++
++        public boolean offlineWarnings = true;
++        public boolean rootUserWarnings = true;
++        public boolean notSecurePrefix = true;
++
++    }
++
+ }

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

@@ -1,32 +1,30 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Thu, 23 Mar 2023 21:20:20 +0900
+Date: Sun, 5 Nov 2023 10:49:05 +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 f719f8aafe7c75e2ef8fcb05f556a8d6bd94b9a0..06ff5dd9e39e2be8dd8397a764813111019ceaed 100644
+index 3dcccca8ede9b203c24ba29b2020a583297b895c..dd707019fb9b2c46d706311862fea91b84793ff9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -239,7 +239,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -160,6 +160,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]);
--        Validate.validState(ServerLoginPacketListenerImpl.isValidUsername(packet.name()), "Invalid characters in username", new Object[0]);
++        if (!org.plazmamc.plazma.configurations.GlobalConfiguration.get().player.allowAnyUsername) // Plazma - Add option to allow any usernames
-+        if (!org.plazmamc.plazma.configurations.GlobalConfiguration.get().player.allowAnyUsername) Validate.validState(ServerLoginPacketListenerImpl.isValidUsername(packet.name()), "Invalid characters in username", new Object[0]); // Plazma
+         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) {
-             if (!this.iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation && !validateUsername(packet.name())) {
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 61f364abb094a1d137478c106fefa22ceb057ed2..a45ff31d08129c0d5f159615d934a4450d54146e 100644
+index 51413e828500792cc493b836bb1460a394ff4f75..c85f1a01c951f85c2347eba18a896e87c4c8b368 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -32,7 +32,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -26,6 +26,7 @@ public class GlobalConfiguration extends ConfigurationPart {
      public Player player;
      public class Player extends ConfigurationPart {
  
--
 +        public boolean allowAnyUsername = false;
  
      }
- }
+ 

patches/server/0013-Player-configuration-section.patch

@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Thu, 23 Mar 2023 21:18:47 +0900
-Subject: [PATCH] Player configuration section
-
-
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 122482e1fae7d6ac8e6b32ebdcf3e611d47901c4..61f364abb094a1d137478c106fefa22ceb057ed2 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -27,5 +27,12 @@ public class GlobalConfiguration extends ConfigurationPart {
-         public boolean enableOfflineWarnings = true;
-         public boolean enableRootUserWarnings = true;
- 
-+    }
-+
-+    public Player player;
-+    public class Player extends ConfigurationPart {
-+
-+
-+
-     }
- }

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

@@ -5,170 +5,165 @@ 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 e95540122ae6a486ce12a5f50fb4d2d073239554..86c9b549e3e75adf9bd5562c4c8d303cf2080e45 100644
+index c783ce59ea766e6c46a3313628b961f27e01ee8b..3f36eedeae4b94ca684c57f4ec8d2d1ab5c51aae 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
-@@ -154,6 +154,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
+@@ -150,6 +150,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
+     protected void registerGoals() {
+         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
      }
-     // Purpur end
++
- 
++    // Plazma start
-+    // Plazma start - Add missing purpur config options
 +    @Override
 +    public boolean isSensitiveToWater() {
-+        return level.purpurConfig.allayTakeDamageFromWater;
++        return level().purpurConfig.allayTakeDamageFromWater;
 +    }
 +
 +    @Override
 +    public boolean isAlwaysExperienceDropper() {
-+        return level.purpurConfig.allayAlwaysDropExp;
++        return level().purpurConfig.allayAlwaysDropExp;
 +    }
 +
 +    @Override
 +    public void initAttributes() {
-+        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level.purpurConfig.allayMaxHealth);
++        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level().purpurConfig.allayMaxHealth);
 +    }
 +    // Plazma end
-+
+     // Purpur end
+ 
      @Override
-     protected Brain.Provider<Allay> brainProvider() {
-         return Brain.provider(Allay.MEMORY_TYPES, Allay.SENSOR_TYPES);
 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 31922ac1139f34e0da61a719e3645c1aaa188890..94536f25980cf642edbfcf0c3d338a0172e0b77f 100644
+index cd9129bb5049c13f08c58b8581d511b59a5bb1b5..bcc3458afac5ece9637df63b9d02c445aa0a4ef9 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
-@@ -90,6 +90,23 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider
+@@ -95,6 +95,18 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+     public int getPurpurBreedTime() {
+         return this.level().purpurConfig.camelBreedingTicks;
      }
-     // Purpur end
- 
-+    // Plazma start - Add missing purpur config options
-+    @Override
-+    public boolean dismountsUnderwater() {
-+        return level.purpurConfig.useDismountsUnderwaterTag ? super.dismountsUnderwater() : !level.purpurConfig.camelRidableInWater;
-+    }
 +
++    // Plazma start
 +    @Override
 +    public boolean isSensitiveToWater() {
-+        return level.purpurConfig.camelTakeDamageFromWater;
++        return level().purpurConfig.camelTakeDamageFromWater;
 +    }
 +
 +    @Override
 +    public boolean isAlwaysExperienceDropper() {
-+        return level.purpurConfig.camelAlwaysDropExp;
++        return level().purpurConfig.camelAlwaysDropExp;
 +    }
 +    // Plazma end
-+
+     // Purpur end
+ 
      @Override
-     public void addAdditionalSaveData(CompoundTag nbt) {
-         super.addAdditionalSaveData(nbt);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-index c355aaed76663d37a5da8b2f49f9808828b4ef9b..dcc1b75361fe9eb250e3946e54454253a8f0e788 100644
+index 9417ce67cc231d5bfa6813f78ec27196eed423c8..4e471e4a259a64c44da5ab450f0137691428ff6a 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
-@@ -145,6 +145,23 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
+@@ -136,6 +136,23 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
+     public float getJumpPower() {
+         return (getRider() != null && isControllable()) ? level().purpurConfig.frogRidableJumpHeight * this.getBlockJumpFactor() : super.getJumpPower();
      }
-     // Purpur end
++
- 
++    // Plazma start
-+    // Plazma start - Add missing purpur config options
 +    @Override
 +    public boolean isSensitiveToWater() {
-+        return level.purpurConfig.frogTakeDamageFromWater;
++        return level().purpurConfig.frogTakeDamageFromWater;
 +    }
 +
 +    @Override
 +    public boolean isAlwaysExperienceDropper() {
-+        return level.purpurConfig.frogAlwaysDropExp;
++        return level().purpurConfig.frogAlwaysDropExp;
 +    }
 +
 +    @Override
 +    public void initAttributes() {
-+        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level.purpurConfig.frogMaxHealth);
++        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level().purpurConfig.frogMaxHealth);
 +    }
 +    // Plazma end
-+
+     // Purpur end
-     @Override
+ 
-     protected Brain.Provider<Frog> brainProvider() {
+     public int getPurpurBreedTime() {
-         return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
 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 aadc6743deb195ac3368548a75be641ffd3da404..90314f86e17ac7756f8211519fc5cde5a411677d 100644
+index 6b012bea26e8ef0c04571f43da67f6e108188830..7c816b879d47a1b8a480f4237d1ff0e11df4c98e 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
-@@ -89,6 +89,23 @@ public class Tadpole extends AbstractFish {
+@@ -87,6 +87,23 @@ public class Tadpole extends AbstractFish {
+     protected void registerGoals() {
+         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
      }
-     // Purpur end
++
- 
++    // Plazma start
-+    // Plazma start - Add missing purpur config options
 +    @Override
 +    public boolean isSensitiveToWater() {
-+        return level.purpurConfig.tadpoleTakeDamageFromWater;
++        return level().purpurConfig.tadpoleTakeDamageFromWater;
 +    }
 +
 +    @Override
 +    public boolean isAlwaysExperienceDropper() {
-+        return level.purpurConfig.tadpoleAlwaysDropExp;
++        return level().purpurConfig.tadpoleAlwaysDropExp;
 +    }
 +
 +    @Override
 +    public void initAttributes() {
-+        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level.purpurConfig.tadpoleMaxHealth);
++        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level().purpurConfig.tadpoleMaxHealth);
 +    }
 +    // Plazma end
-+
+     // Purpur end
+ 
      @Override
-     protected PathNavigation createNavigation(Level world) {
-         return new WaterBoundPathNavigation(this, world);
 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 adae992ade60e0fce7ca0cc10192720025a574fe..9725389b6dd7643d00803799ce195d2d471cdcb8 100644
+index dcb10e2ea1e0c7d0479adae5bc2ff57ece172aad..795c93352dfa69fad0e034a8377eceb6dc1e81da 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
-@@ -108,6 +108,18 @@ public class Sniffer extends Animal {
+@@ -106,6 +106,18 @@ public class Sniffer extends Animal {
+     public boolean isControllable() {
+         return level().purpurConfig.snifferControllable;
      }
-     // Purpur end
++
- 
++    // Plazma start
-+    // Plazma start - Add missing purpur config options
 +    @Override
 +    public boolean isSensitiveToWater() {
-+        return level.purpurConfig.snifferTakeDamageFromWater;
++        return level().purpurConfig.snifferTakeDamageFromWater;
 +    }
 +
 +    @Override
 +    public boolean isAlwaysExperienceDropper() {
-+        return level.purpurConfig.snifferAlwaysDropExp;
++        return level().purpurConfig.snifferAlwaysDropExp;
 +    }
 +    // Plazma end
-+
-     // CraftBukkit start - SPIGOT-7295: moved from constructor to appropriate location
-     @Override
-     protected void defineSynchedData() {
-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 69e5b4b6c8d5725bc2fb7cd819219e4ff9df45bd..41301ad56fbcbe0f13447bd3b515d15bf58554c4 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 VibrationListener.VibrationListen
-     }
      // Purpur end
  
-+    // Plazma start - Add missing purpur config options
+     @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
+--- 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 {
+         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
 +    @Override
 +    public boolean isSensitiveToWater() {
-+        return level.purpurConfig.wardenTakeDamageFromWater;
++        return level().purpurConfig.wardenTakeDamageFromWater;
 +    }
 +
 +    @Override
 +    public boolean isAlwaysExperienceDropper() {
-+        return level.purpurConfig.wardenAlwaysDropExp;
++        return level().purpurConfig.wardenAlwaysDropExp;
 +    }
 +
 +    @Override
 +    public void initAttributes() {
-+        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level.purpurConfig.wardenMaxHealth);
++        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level().purpurConfig.wardenMaxHealth);
 +    }
 +    // Plazma end
-+
+     // Purpur end
+ 
      @Override
-     public Packet<ClientGamePacketListener> getAddEntityPacket() {
-         return new ClientboundAddEntityPacket(this, this.hasPose(Pose.EMERGING) ? 1 : 0);
 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 3a720375c3daa961a34363f78c2c51d301c3fa06..90bd114feb0924669e61f92f301cdcf7f69405a4 100644
+index d70c1206df96b03c031399049a65e6a765d80347..e885d2f21cfbf1fd1c61b29e34f3f51a9decfe88 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
@@ -176,7 +171,7 @@ index 3a720375c3daa961a34363f78c2c51d301c3fa06..90bd114feb0924669e61f92f301cdcf7
      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 - Add missing purpur config options
++        this.itemStacks = NonNullList.withSize(org.purpurmc.purpur.PurpurConfig.chestBoatRows * 9, ItemStack.EMPTY); // Plazma
      }
  
      public ChestBoat(Level world, double d0, double d1, double d2) {
@@ -185,35 +180,35 @@ index 3a720375c3daa961a34363f78c2c51d301c3fa06..90bd114feb0924669e61f92f301cdcf7
      @Override
      public int getContainerSize() {
 -        return 27;
-+        return org.purpurmc.purpur.PurpurConfig.chestBoatRows * 9; // Plazma - Add missing purpur config options
++        return org.purpurmc.purpur.PurpurConfig.chestBoatRows * 9; // Plazma
      }
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 529247dad9300b0abc024464fb0ca35c4bc0f410..b1cc96c751ae8f8befb0287d675d19c5a2768ba2 100644
+index f9f7664e4a6a4e24dcb3b8da0a807a984a698429..22e74b716d29ecfe75bd49234bef861cd97cb79e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -327,6 +327,7 @@ public class PurpurConfig {
+@@ -329,6 +329,7 @@ public class PurpurConfig {
      }
  
      public static int barrelRows = 3;
-+    public static int chestBoatRows = 3; // Plazma - Add missing purpur config options
++    public static int chestBoatRows = 3; // Plazma
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
      public static boolean cryingObsidianValidForPortalFrame = false;
-@@ -367,6 +368,7 @@ public class PurpurConfig {
+@@ -369,6 +370,7 @@ public class PurpurConfig {
              case 1 -> 9;
              default -> 27;
          });
-+        chestBoatRows = getInt("settings.blocks.chest_boat.rows", chestBoatRows); // Plazma - Add missing purpur config options
++        chestBoatRows = getInt("settings.blocks.chest_boat.rows", chestBoatRows); // Plazma
          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 aca570efe2360d7d5f71e62433f6b1cd08f5214b..b4cb7d12aa02b885ca48ba5b27cbb7c20c2f5d7c 100644
+index 9cb79d203b6ec345d719cd488d2cce8f877fe2bd..fc30f2dcf7227f7cd087b2e5b8d3dc73e18405c6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1096,7 +1096,15 @@ public class PurpurWorldConfig {
+@@ -1115,7 +1115,15 @@ public class PurpurWorldConfig {
      public boolean allayRidableInWater = true;
      public boolean allayControllable = true;
      public List<String> allayRespectNBT = new ArrayList<>();
@@ -229,23 +224,23 @@ index aca570efe2360d7d5f71e62433f6b1cd08f5214b..b4cb7d12aa02b885ca48ba5b27cbb7c2
          allayRidable = getBoolean("mobs.allay.ridable", allayRidable);
          allayRidableInWater = getBoolean("mobs.allay.ridable-in-water", allayRidableInWater);
          allayControllable = getBoolean("mobs.allay.controllable", allayControllable);
-@@ -1207,7 +1215,15 @@ public class PurpurWorldConfig {
+@@ -1234,7 +1242,15 @@ public class PurpurWorldConfig {
-     public double camelJumpStrengthMax = 0.42D;
      public double camelMovementSpeedMin = 0.09D;
      public double camelMovementSpeedMax = 0.09D;
+     public int camelBreedingTicks = 6000;
 +    // Plazma start - Add missing purpur config options
-+    public boolean camelRidableInWater = false;
++    //public boolean camelRidableInWater = false;
 +    public boolean camelTakeDamageFromWater = false;
 +    public boolean camelAlwaysDropExp = false;
      private void camelSettings() {
-+        camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater);
++        //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
+         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);
-         camelJumpStrengthMin = getDouble("mobs.camel.attributes.jump_strength.min", camelJumpStrengthMin);
+@@ -1662,7 +1678,15 @@ public class PurpurWorldConfig {
-@@ -1634,7 +1650,15 @@ public class PurpurWorldConfig {
      public boolean frogControllable = true;
      public float frogRidableJumpHeight = 0.65F;
      public int frogBreedingTicks = 6000;
@@ -261,7 +256,7 @@ index aca570efe2360d7d5f71e62433f6b1cd08f5214b..b4cb7d12aa02b885ca48ba5b27cbb7c2
          frogRidable = getBoolean("mobs.frog.ridable", frogRidable);
          frogRidableInWater = getBoolean("mobs.frog.ridable-in-water", frogRidableInWater);
          frogControllable = getBoolean("mobs.frog.controllable", frogControllable);
-@@ -2585,7 +2609,13 @@ public class PurpurWorldConfig {
+@@ -2617,7 +2641,13 @@ public class PurpurWorldConfig {
      public boolean snifferControllable = true;
      public double snifferMaxHealth = 14.0D;
      public int snifferBreedingTicks = 6000;
@@ -275,7 +270,7 @@ index aca570efe2360d7d5f71e62433f6b1cd08f5214b..b4cb7d12aa02b885ca48ba5b27cbb7c2
          snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable);
          snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater);
          snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable);
-@@ -2684,7 +2714,15 @@ public class PurpurWorldConfig {
+@@ -2716,7 +2746,15 @@ public class PurpurWorldConfig {
      public boolean tadpoleRidable = false;
      public boolean tadpoleRidableInWater = true;
      public boolean tadpoleControllable = true;
@@ -291,7 +286,7 @@ index aca570efe2360d7d5f71e62433f6b1cd08f5214b..b4cb7d12aa02b885ca48ba5b27cbb7c2
          tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable);
          tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater);
          tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable);
-@@ -2894,7 +2932,15 @@ public class PurpurWorldConfig {
+@@ -2926,7 +2964,15 @@ public class PurpurWorldConfig {
      public boolean wardenRidable = false;
      public boolean wardenRidableInWater = true;
      public boolean wardenControllable = true;

patches/server/0015-Add-permission-to-bypass-reducedDebugInfo-gamerule.patch

@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Thu, 23 Mar 2023 21:35:15 +0900
-Subject: [PATCH] Add permission to bypass reducedDebugInfo gamerule
-
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ff56981a03b55f9ee1ec8ad36adaf9849b2c914b..b22b86d7f226e0e24d6be27ea33ec9d690f8f238 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -275,7 +275,7 @@ public abstract class PlayerList {
-         ServerGamePacketListenerImpl playerconnection = new ServerGamePacketListenerImpl(this.server, connection, player);
-         GameRules gamerules = worldserver1.getGameRules();
-         boolean flag = gamerules.getBoolean(GameRules.RULE_DO_IMMEDIATE_RESPAWN);
--        boolean flag1 = gamerules.getBoolean(GameRules.RULE_REDUCEDDEBUGINFO);
-+        boolean flag1 = gamerules.getBoolean(GameRules.RULE_REDUCEDDEBUGINFO) && !player.getBukkitEntity().hasPermission("plazma.bypass-reduced-debug-info-gamerule"); // Plazma
- 
-         // Spigot - view distance
-         playerconnection.send(new ClientboundLoginPacket(player.getId(), worlddata.isHardcore(), player.gameMode.getGameModeForPlayer(), player.gameMode.getPreviousGameModeForPlayer(), this.server.levelKeys(), this.synchronizedRegistries, worldserver1.dimensionTypeId(), worldserver1.dimension(), BiomeManager.obfuscateSeed(worldserver1.getSeed()), this.getMaxPlayers(), worldserver1.getChunkSource().chunkMap.playerChunkManager.getTargetSendDistance(), worldserver1.getChunkSource().chunkMap.playerChunkManager.getTargetTickViewDistance(), flag1, !flag, worldserver1.isDebug(), worldserver1.isFlat(), player.getLastDeathLocation())); // Paper - replace old player chunk management
-@@ -1300,7 +1300,7 @@ public abstract class PlayerList {
-         player.getEntityData().refresh(player); // CraftBukkkit - SPIGOT-7218: sync metadata
-         player.connection.send(new ClientboundSetCarriedItemPacket(player.getInventory().selected));
-         // CraftBukkit start - from GameRules
--        int i = player.level.getGameRules().getBoolean(GameRules.RULE_REDUCEDDEBUGINFO) ? 22 : 23;
-+        int i = player.level.getGameRules().getBoolean(GameRules.RULE_REDUCEDDEBUGINFO) && !player.getBukkitEntity().hasPermission("plazma.bypass-reduced-debug-info-gamerule") ? 22 : 23; // Plazma
-         player.connection.send(new ClientboundEntityEventPacket(player, (byte) i));
-         float immediateRespawn = player.level.getGameRules().getBoolean(GameRules.RULE_DO_IMMEDIATE_RESPAWN) ? 1.0F: 0.0F;
-         player.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.IMMEDIATE_RESPAWN, immediateRespawn));

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

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

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

@@ -0,0 +1,930 @@
+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 389322d3ca9b1f3789271936a7e6c60bd7c27893..6ca87960654becdc7fd7d9b8465a140c0db2b8b9 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;
+@@ -2302,10 +2302,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; // Pufferfish // Purpur
+         return this.profiler;
+     }
++     */ // Plazma - Completely remove profiler
+ 
+     public abstract boolean isSingleplayerOwner(GameProfile profile);
+ 
+@@ -2542,6 +2544,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     }
+     // CraftBukkit end
+ 
++    /* // Plazma - Completely remove profiler
+     private void startMetricsRecordingTick() {
+         if (false && this.willStartRecordingMetrics) { // Purpur
+             this.metricsRecorder = ActiveMetricsRecorder.createStarted(new ServerMetricsSamplersProvider(Util.timeSource, this.isDedicatedServer()), Util.timeSource, Util.ioPool(), new MetricsPersister("server"), this.onMetricsRecordingStopped, (path) -> {
+@@ -2557,6 +2560,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         //this.metricsRecorder.startTick(); // Purpur
+         //this.profiler.startTick(); // Purpur
+     }
++     */ // Plazma - Completely remove profiler
+ 
+     private void endMetricsRecordingTick() {
+         //this.profiler.endTick(); // Purpur
+diff --git a/src/main/java/net/minecraft/server/ServerAdvancementManager.java b/src/main/java/net/minecraft/server/ServerAdvancementManager.java
+index 8189c549edd14a351fc5e75be23da7378bbd3532..8c44b54aa6b3db4f52d0d6ad7f3d341f11b293f7 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 3771caa73b0b41428f3d629aca1f562df7bcfaff..a88f6bbed191b6fd3ef2da625df45520331cf7d7 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 43a46feb5fb4bf23d71bc4f6c08caa93b1959ffc..16c2db8fbfcaf15efb94c04e1bb2508e85812690 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 e46207a250a5456589da06fd5fad2a385ef7d4a5..9301ec8142fbf5c5112cac75aef1b8e35737ce43 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, minecraftserver.registryAccess())), spigotConfig -> minecraftserver.plazmaConfigurations.createWorldConfig(org.plazmamc.plazma.configurations.PlazmaConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess())), executor); // Paper - 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, minecraftserver.registryAccess())), spigotConfig -> minecraftserver.plazmaConfigurations.createWorldConfig(org.plazmamc.plazma.configurations.PlazmaConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess())), executor); // Paper - 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/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
+index 80c03bd4e5d7e20bb8a4e14af5620f5c57a05fd4..aeae6117b398b84d5c8ecaa175a72867416ff166 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 388363948595247471fa4c3c6801fc493d61c0d0..6851ee45b5b41cf549a8aed14d95545b0d120414 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 af4eb54d99b67d059534e5e55e952aa41bb87bc7..412dd103bad498c3c93b7a3ab98f834944d514eb 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;
+@@ -262,7 +262,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+ 
+     //protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(java.util.concurrent.ThreadLocalRandom.current().nextLong()); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter // Purpur - dont break ABI
+ 
+-    protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.function.Function<org.spigotmc.SpigotWorldConfig, org.plazmamc.plazma.configurations.WorldConfigurations> plazmaWorldConfigurationCreator, java.util.concurrent.Executor executor) { // Paper - 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.WorldConfigurations> plazmaWorldConfigurationCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor // 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.plazmaConfig = plazmaWorldConfigurationCreator.apply(this.spigotConfig); // Plazma
+@@ -279,7 +279,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(() -> {
+@@ -1833,6 +1833,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();
+@@ -1841,6 +1842,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 66656c4cf157228c9f52b33b358713ef0172f9ff..a8a360b794cec35b9f7ab137aaf35fba1d610f26 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;
+@@ -455,7 +455,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
+                     // Paper - starlight - remove skyLightSources
+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 08f5239d5eea9133340ec9e1a3a7d8d5e792ced0..ad306d5d69b2bd6ac4ddbdd13dd0a34c9c4cc4f5 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 // Plazma - Completely remove profiler
+ import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
+ import org.bukkit.craftbukkit.CraftLootTable;
+ import org.bukkit.craftbukkit.util.CraftNamespacedKey;
+@@ -36,7 +36,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/0017-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 e7554ec800f321e4e34c926c53f2375a8c3aa979..fc3c0ea41563995b1b115271cda4e9ca76245c4e 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().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) {
+@@ -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().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) {
+@@ -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().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/0017-Structure-Configuration.patch

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sat, 25 Mar 2023 00:04:41 +0900
-Subject: [PATCH] Structure Configuration
-
-
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 8ba1c5b6731d43c02b415e4d79a20c1de0c03ad5..4ee9f3ca88e89a8dcbfe6c807036386ef679da0a 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-@@ -30,4 +30,21 @@ public class LevelConfigurations extends ConfigurationPart {
-         public int maxChunksPerTick = 5;
- 
-     }
-+
-+    public Structure structure;
-+    public class Structure extends ConfigurationPart {
-+
-+        public Portal portal;
-+        public class Portal extends ConfigurationPart {
-+
-+            public NetherPortal netherPortal;
-+            public class NetherPortal extends ConfigurationPart {
-+
-+
-+
-+            }
-+
-+        }
-+
-+    }
- }

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

@@ -1,85 +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
-
-
-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..677f546cee0ebda24a6e77cb5fedd41078c7fff4 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.portal.netherPortal.size.width.min() && i <= this.level.getMinecraftWorld().plazmaLevelConfiguration().structure.portal.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.portal.netherPortal.size.height.min() && i <= this.level.getMinecraftWorld().plazmaLevelConfiguration().structure.portal.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.portal.netherPortal.size.width.min() && this.width <= this.level.getMinecraftWorld().plazmaLevelConfiguration().structure.portal.netherPortal.size.width.max() && this.height >= this.level.getMinecraftWorld().plazmaLevelConfiguration().structure.portal.netherPortal.size.height.min() && this.height <= this.level.getMinecraftWorld().plazmaLevelConfiguration().structure.portal.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 4ee9f3ca88e89a8dcbfe6c807036386ef679da0a..1cf5344d3ade76f6c24c7ea68d98b02e0dc62001 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-@@ -40,7 +40,43 @@ 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 Height height;
-+
-+                    public class Width extends ConfigurationPart {
-+
-+                        int min = 2;
-+                        int max = 21;
-+
-+                        public int min() {
-+                            return Math.max(this.min, 1);
-+                        }
-+
-+                        public int max() {
-+                            return Math.max(this.min, this.max);
-+                        }
-+
-+                    }
-+
-+                    public class Height extends ConfigurationPart {
-+
-+                        int min = 3;
-+                        int max = 21;
-+
-+                        public int min() {
-+                            return Math.max(this.min, 2);
-+                        }
-+
-+                        public int max() {
-+                            return Math.max(this.min, this.max);
-+                        }
-+
-+                    }
-+
-+                }
- 
-             }
- 

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

@@ -0,0 +1,333 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Wed, 27 Sep 2023 21:18:22 +0900
+Subject: [PATCH] Reduce create random instance
+
+
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index 6ca87960654becdc7fd7d9b8465a140c0db2b8b9..cda99102949ae9d722c347e0dd610dfff625b5b8 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;
+     @Nullable
+     private ServerStatus.Favicon statusIcon;
+-    private final RandomSource random;
++    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..e27867a95d49531507de63be09604d476a0e43e5 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 {
+         if (maxY < j) {
+             throw SpreadPlayersCommand.ERROR_INVALID_MAX_HEIGHT.create(maxY, j);
+         } else {
+-            RandomSource randomsource = RandomSource.create();
++            RandomSource randomsource = worldserver.plazmaConfig().misc.reduceRandom ? worldserver.getRandom() : RandomSource.create(); // Plazma - Reduce create random instance
+             double d0 = (double) (center.x - maxRange);
+             double d1 = (double) (center.y - maxRange);
+             double d2 = (double) (center.x + maxRange);
+diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+index 7b72be8dcaf3fc5c7151c847faa2dfc75ef9eeb7..9a818c8f1450d31d29fd72cda45a14eec9034615 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+@@ -449,7 +449,7 @@ public class ServerPlayer extends Player {
+             long l = k * k;
+             int i1 = l > 2147483647L ? Integer.MAX_VALUE : (int) l;
+             int j1 = this.getCoprime(i1);
+-            int k1 = RandomSource.create().nextInt(i1);
++            int k1 = (worldserver.plazmaConfig().misc.reduceRandom ? worldserver.getRandom() : RandomSource.create()).nextInt(i1); // Plazma - Reduce create random instance
+ 
+             for (int l1 = 0; l1 < i1; ++l1) {
+                 int i2 = (k1 + j1 * l1) % i1;
+@@ -486,7 +486,7 @@ public class ServerPlayer extends Player {
+             long l = k * k;
+             int i1 = l > 2147483647L ? Integer.MAX_VALUE : (int) l;
+             int j1 = this.getCoprime(i1);
+-            int k1 = RandomSource.create().nextInt(i1);
++            int k1 = (world.plazmaConfig().misc.reduceRandom ? world.getRandom() : RandomSource.create()).nextInt(i1); // Plazma - Reduce create random instance
+ 
+             for (int l1 = 0; l1 < i1; ++l1) {
+                 int i2 = (k1 + j1 * l1) % i1;
+diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+index dd707019fb9b2c46d706311862fea91b84793ff9..05ef30ecdb68d1d254246431e7d5cecf9a38427e 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,
+         this.serverId = "";
+         this.server = server;
+         this.connection = connection;
+-        this.challenge = Ints.toByteArray(RandomSource.create().nextInt());
++        this.challenge = Ints.toByteArray((org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom ? server.random() : RandomSource.create()).nextInt()); // Plazma - Reduce create random instance
+     }
+ 
+     @Override
+diff --git a/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java b/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java
+index 1ef089dbf83de35d875c00efdf468c397be56978..832c3fa9f6f6706c48d5744e15d3c748edafe8a4 100644
+--- a/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java
++++ b/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java
+@@ -349,7 +349,7 @@ public class QueryThreadGs4 extends GenericThread {
+             this.identBytes[2] = bs[5];
+             this.identBytes[3] = bs[6];
+             this.ident = new String(this.identBytes, StandardCharsets.UTF_8);
+-            this.challenge = RandomSource.create().nextInt(16777216);
++            this.challenge = (org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom ? net.minecraft.server.MinecraftServer.getServer().random() : RandomSource.create()).nextInt(16777216); // Plazma - Reduce create random instance
+             this.challengeBytes = String.format(Locale.ROOT, "\t%s%d\u0000", this.ident, this.challenge).getBytes(StandardCharsets.UTF_8);
+         }
+ 
+diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java b/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java
+index fe3ab3d388f0481fb0db06b7f730f868dbf8e8a5..57d4eec19146f2ec36c8f99a4c77f2a20aa7cd09 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
+-    private final RandomSource random = RandomSource.create();
++    private final RandomSource random = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom ? net.minecraft.server.MinecraftServer.getServer().random() : RandomSource.create(); // Plazma
+     private final boolean isUnsafe; // Paper
+ 
+     public ShufflingList() {
+diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java
+index 7094701d213c73ba47ace806962244c10fdf4dda..590c26307374edd65a2e22de18d12f34addcef64 100644
+--- a/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java
++++ b/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java
+@@ -8,7 +8,7 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+ import net.minecraft.world.entity.ai.targeting.TargetingConditions;
+ 
+ public abstract class Sensor<E extends LivingEntity> {
+-    private static final RandomSource RANDOM = RandomSource.createThreadSafe();
++    private static final RandomSource RANDOM = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom && org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.ignoreThreadSafeRandom ? net.minecraft.server.MinecraftServer.getServer().random() : RandomSource.createThreadSafe(); // Plazma - Reduce create random instance
+     private static final int DEFAULT_SCAN_RATE = 20;
+     protected static final int TARGETING_RANGE = 16;
+     private static final TargetingConditions TARGET_CONDITIONS = TargetingConditions.forNonCombat().range(16.0D);
+diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java b/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java
+index ece82743df21f0b776382821ad75dee96d0a0748..44db438185d1ffb1adea09ba5f1cf4515a113700 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java
++++ b/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java
+@@ -32,7 +32,7 @@ public class AngerManagement {
+     @VisibleForTesting
+     protected static final int MAX_ANGER = 150;
+     private static final int DEFAULT_ANGER_DECREASE = 1;
+-    private int conversionDelay = Mth.randomBetweenInclusive(RandomSource.create(), 0, 2);
++    private int conversionDelay = Mth.randomBetweenInclusive((org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom ? net.minecraft.server.MinecraftServer.getServer().random() : RandomSource.create()), 0, 2); // Plazma - Reduce create random instance
+     int highestAnger;
+     private static final Codec<Pair<UUID, Integer>> SUSPECT_ANGER_PAIR = RecordCodecBuilder.create((instance) -> {
+         return instance.group(UUIDUtil.CODEC.fieldOf("uuid").forGetter(Pair::getFirst), ExtraCodecs.NON_NEGATIVE_INT.fieldOf("anger").forGetter(Pair::getSecond)).apply(instance, Pair::of);
+diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
+index a5443f92786427c42092aec8350e7ab37704db7a..0383c9e75a12c5832cf69daf14b8037365c43cfb 100644
+--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
++++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
+@@ -32,7 +32,7 @@ public class WanderingTraderSpawner implements CustomSpawner {
+     private static final int SPAWN_CHANCE_INCREASE = 25;
+     private static final int SPAWN_ONE_IN_X_CHANCE = 10;
+     private static final int NUMBER_OF_SPAWN_ATTEMPTS = 10;
+-    private final RandomSource random = RandomSource.create();
++    private final RandomSource random = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom ? net.minecraft.server.MinecraftServer.getServer().random() : RandomSource.create(); // Plazma - reduce create random instace
+     private final ServerLevelData serverLevelData;
+     private int tickDelay;
+     private int spawnDelay;
+diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
+index a2093158e57d5f43c4afa66386481b82b3c4c3c4..2b75115caf82b9c4ccdd813b98af569e80ac2629 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 {
+ 
+     private FishingHook(EntityType<? extends FishingHook> type, Level world, int luckOfTheSeaLevel, int lureLevel) {
+         super(type, world);
+-        this.syncronizedRandom = RandomSource.create();
++        this.syncronizedRandom = world.plazmaConfig().misc.reduceRandom ? world.getRandom() : RandomSource.create(); // Plazma - Reduce create random instance
+         this.openWater = true;
+         this.currentState = FishingHook.FishHookState.FLYING;
+         this.noCulling = true;
+diff --git a/src/main/java/net/minecraft/world/entity/raid/Raid.java b/src/main/java/net/minecraft/world/entity/raid/Raid.java
+index eaa2943b667967f93f28d9d794d702fdaeb670ec..689a4ee7b3f136b14e8e56709cac7d2da89c8efd 100644
+--- a/src/main/java/net/minecraft/world/entity/raid/Raid.java
++++ b/src/main/java/net/minecraft/world/entity/raid/Raid.java
+@@ -109,7 +109,7 @@ public class Raid {
+ 
+     public Raid(int id, ServerLevel world, BlockPos pos) {
+         this.raidEvent = new ServerBossEvent(Raid.RAID_NAME_COMPONENT, BossEvent.BossBarColor.RED, BossEvent.BossBarOverlay.NOTCHED_10);
+-        this.random = RandomSource.create();
++        this.random = world.plazmaConfig().misc.reduceRandom ? world.getRandom() : RandomSource.create(); // Plazma - Reduce create random instace
+         this.waveSpawnPos = Optional.empty();
+         this.id = id;
+         this.level = world;
+@@ -123,7 +123,7 @@ public class Raid {
+ 
+     public Raid(ServerLevel world, CompoundTag nbt) {
+         this.raidEvent = new ServerBossEvent(Raid.RAID_NAME_COMPONENT, BossEvent.BossBarColor.RED, BossEvent.BossBarOverlay.NOTCHED_10);
+-        this.random = RandomSource.create();
++        this.random = world.plazmaConfig().misc.reduceRandom ? world.getRandom() : RandomSource.create(); // Plazma - Reduce create random instace
+         this.waveSpawnPos = Optional.empty();
+         this.level = world;
+         this.id = nbt.getInt("Id");
+diff --git a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
+index d604b7ec46f08993647979ed220a84842e3fe325..b0b6580a08b15dbfc542ee1fd9e5b6737f8af004 100644
+--- a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
++++ b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
+@@ -97,7 +97,7 @@ public class EnchantmentMenu extends AbstractContainerMenu {
+             }
+             // Purpur end
+         };
+-        this.random = RandomSource.create();
++        this.random = playerInventory.player.level().plazmaConfig().misc.reduceRandom ? playerInventory.player.level().random : RandomSource.create(); // Plazma - Reduce create random instace
+         this.enchantmentSeed = DataSlot.standalone();
+         this.costs = new int[3];
+         this.enchantClue = new int[]{-1, -1, -1};
+diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
+index ef9b1687dd2dfda5398523140aecc678b4690642..130a41387a2546b31019ad918849b2c283ed09d9 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 {
+     }
+ 
+     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) {
+-        this.random = RandomSource.create();
++        this.random = world.plazmaConfig().misc.reduceRandom ? world.getRandom() : RandomSource.create(); // Plazma - Reduce create random instace
+         this.toBlow = new ObjectArrayList();
+         this.hitPlayers = Maps.newHashMap();
+         this.level = world;
+diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
+index 412dd103bad498c3c93b7a3ab98f834944d514eb..7a7f417c2a0af73a35297274b8ddd6ac581901ae 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 {
+     public final Thread thread;
+     private final boolean isDebug;
+     private int skyDarken;
+-    protected int randValue = RandomSource.create().nextInt();
+     protected final int addend = 1013904223;
+     protected float oRainLevel;
+     public float rainLevel;
+     protected float oThunderLevel;
+     public float thunderLevel;
+     public final RandomSource random = RandomSource.create();
++    protected int randValue = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom ? random.nextInt() : RandomSource.create().nextInt(); // Plazma - Reduce create random instace
+     /** @deprecated */
+     @Deprecated
+-    private final RandomSource threadSafeRandom = RandomSource.createThreadSafe();
++    private final RandomSource threadSafeRandom = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.ignoreThreadSafeRandom ? random : RandomSource.createThreadSafe(); // Plazma - Reduce create random instace
+     private final ResourceKey<DimensionType> dimensionTypeId;
+     private final Holder<DimensionType> dimensionTypeRegistration;
+     public final WritableLevelData levelData;
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
+index b7370e64fd0d50e8725d7d5afc30af2e8bc8455d..9ec2a60c8240f7a3e4cd7944d070156dbf55ac2c 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.reduceRandom ? net.minecraft.server.MinecraftServer.getServer().random() : 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..b847f59c5d3e0d7ccb22eaa5d9068082db5ba9a4 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 {
+     }
+ 
+     private static void spawnGatewayPortal(ServerLevel world, BlockPos pos, EndGatewayConfiguration config) {
+-        Feature.END_GATEWAY.place(config, world, world.getChunkSource().getGenerator(), RandomSource.create(), pos);
++        Feature.END_GATEWAY.place(config, world, world.getChunkSource().getGenerator(), (world.plazmaConfig().misc.reduceRandom ? world.getRandom() : RandomSource.create()), pos); // Plazma - Reduce create random instance
+     }
+ 
+     @Override
+diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
+index f8cd23fb6ea7909b8f30bd21d3f2c7bcc483ef21..3a4044271e23faf4c5271237aba700103f6df830 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 {
+             List<CompletableFuture<ChunkPos>> list = new ArrayList(j);
+             int k = placement.spread();
+             HolderSet<Biome> holderset = placement.preferredBiomes();
+-            RandomSource randomsource = RandomSource.create();
++            RandomSource randomsource = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom ? net.minecraft.server.MinecraftServer.getServer().random() : RandomSource.create(); // Plazma - Reduce create random instace
+ 
+             // Paper start
+             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..c98d65c146213bdf530916b8ec371e0b0b8f23e7 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 {
+ 
+                         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.plazmaConfig().misc.reduceRandom ? world.getRandom() : RandomSource.create()), new BlockPos(endSpike.getCenterX(), 45, endSpike.getCenterZ())); // Plazma - Reduce create random instance
+                     }
+                 } else if (bl) {
+                     fight.setRespawnStage(SUMMONING_DRAGON);
+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..c8b29f79725bb9ccec5b48476e242609a452402c 100644
+--- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
++++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
+@@ -472,7 +472,7 @@ public class EndDragonFight {
+         this.level.registryAccess().registry(Registries.CONFIGURED_FEATURE).flatMap((iregistry) -> {
+             return iregistry.getHolder(EndFeatures.END_GATEWAY_DELAYED);
+         }).ifPresent((holder_c) -> {
+-            ((ConfiguredFeature) holder_c.value()).place(this.level, this.level.getChunkSource().getGenerator(), RandomSource.create(), pos);
++            ((ConfiguredFeature) 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
+-        if (worldgenendtrophy.place(FeatureConfiguration.NONE, this.level, this.level.getChunkSource().getGenerator(), RandomSource.create(), this.portalLocation)) {
++        if (worldgenendtrophy.place(FeatureConfiguration.NONE, this.level, this.level.getChunkSource().getGenerator(), (this.level.plazmaConfig().misc.reduceRandom ? this.level.getRandom() : RandomSource.create()), this.portalLocation)) { // Plazma - Reduce create random instace
+             int i = Mth.positiveCeilDiv(4, 16);
+ 
+             this.level.getChunkSource().chunkMap.waitForLightBeforeSending(new ChunkPos(this.portalLocation), i);
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
+index c13cdbaf7abdf120a3969f8e887b4c3b78989c9c..5bb9bfbad85a115bf32955c2abc89edc2e7a6e43 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
+@@ -14,11 +14,12 @@ import org.bukkit.inventory.meta.FireworkMeta;
+ 
+ public class CraftFirework extends CraftProjectile implements Firework {
+ 
+-    private final Random random = new Random();
++    private final net.minecraft.util.RandomSource random; // Plazma - Reduce create random instance
+     //private CraftItemStack item; // Paper - Remove usage, not accurate representation of current item.
+ 
+     public CraftFirework(CraftServer server, FireworkRocketEntity entity) {
+         super(server, entity);
++        this.random = this.getHandle().level().plazmaConfig().misc.reduceRandom ? this.getHandle().level().getRandom() : net.minecraft.util.RandomSource.create(); // Plazma - Reduce create random instance
+ 
+ //        Paper Start - Expose firework item directly
+ //        ItemStack item = this.getHandle().getEntityData().get(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM);
+diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+index c85f1a01c951f85c2347eba18a896e87c4c8b368..d88208cb454d1042440803c817d99c5dcb775330 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+@@ -40,6 +40,8 @@ public class GlobalConfiguration extends ConfigurationPart {
+     public Miscellaneous misc;
+     public class Miscellaneous extends ConfigurationPart {
+ 
++        public boolean reduceRandom = OPTIMIZE;
++        public boolean ignoreThreadSafeRandom = false;
+ 
+     }
+ 
+diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
+index d79410cc8b6054e5d3297b3e768fb232f97062e4..e9850b634c4e9bbebea6534690632b067b69b0b6 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
+@@ -22,6 +22,7 @@ public class WorldConfigurations extends ConfigurationPart {
+     public Miscellaneous misc;
+     public class Miscellaneous extends ConfigurationPart {
+ 
++        public boolean reduceRandom = OPTIMIZE;
+ 
+     }
+ 

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

@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Wed, 27 Sep 2023 22:11:15 +0900
+Subject: [PATCH] Apply various optimizations
+
+[REFERENCE PATCHES]
+Akarin - Swaps the predicate order of collision
+
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index a13e6d41584a55e3e17d55d568b23f48082750ef..23eb620351ee08cac97e0408f1fc6cee33f036d0 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -2139,8 +2139,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+     public void playerTouch(Player player) {}
+ 
+     public void push(Entity entity) {
++        if (entity.noPhysics || this.noPhysics) return; // Plazma
+         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
+                 double d0 = entity.getX() - this.getX();
+                 double d1 = entity.getZ() - this.getZ();
+@@ -2169,7 +2170,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+                     }
+                 }
+ 
+-            }
++            //} // Plazma
+         }
+     }
+ 

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

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

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

@@ -1,189 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sat, 25 Mar 2023 20:02:59 +0900
-Subject: [PATCH] Reduce create random instance
-
-
-diff --git a/src/main/java/net/minecraft/server/commands/SpreadPlayersCommand.java b/src/main/java/net/minecraft/server/commands/SpreadPlayersCommand.java
-index 591163d8f8300b084ac734800efee902c4def958..d74401ca3182145d136ad668704f5c043b163317 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 {
-         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
-             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 40eda117db2e3f578ad9d25522b6aadfe319b5cc..ef624a99c971aa5c4ce3869d10e2435c0bc8e0a4 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -405,7 +405,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
- 
-             for (int l1 = 0; l1 < i1; ++l1) {
-                 int i2 = (k1 + j1 * l1) % i1;
-@@ -442,7 +442,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);
- 
-             for (int l1 = 0; l1 < i1; ++l1) {
-                 int i2 = (k1 + j1 * l1) % i1;
-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..dc111e0d1e7303c56cd12fa83be3ff85ab989e1b 100644
---- a/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java
-+++ b/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java
-@@ -349,7 +349,7 @@ public class QueryThreadGs4 extends GenericThread {
-             this.identBytes[2] = bs[5];
-             this.identBytes[3] = bs[6];
-             this.ident = new String(this.identBytes, StandardCharsets.UTF_8);
--            this.challenge = RandomSource.create().nextInt(16777216);
-+            this.challenge = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceCreateRandomInstance ? java.util.concurrent.ThreadLocalRandom.current().nextInt(16777216) : RandomSource.create().nextInt(16777216); // Plazma
-             this.challengeBytes = String.format(Locale.ROOT, "\t%s%d\u0000", this.ident, this.challenge).getBytes(StandardCharsets.UTF_8);
-         }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-index bcb0f3fd09ed064b64dc6495302b40828d906837..c6152b295a2f46e5204f42fe76e6cd10127ce12e 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 {
- 
-     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
-         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 879c3bb661e24b9682b654def57c2800f4f8ca92..4c465466543e51ff1e8343d3af7ee31a8b04b839 100644
---- a/src/main/java/net/minecraft/world/entity/raid/Raid.java
-+++ b/src/main/java/net/minecraft/world/entity/raid/Raid.java
-@@ -110,7 +110,7 @@ public class Raid {
- 
-     public Raid(int id, ServerLevel world, BlockPos pos) {
-         this.raidEvent = new ServerBossEvent(Raid.RAID_NAME_COMPONENT, BossEvent.BossBarColor.RED, BossEvent.BossBarOverlay.NOTCHED_10);
--        this.random = RandomSource.create();
-+        this.random = world.plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? world.getRandom() : RandomSource.create(); // Plazma
-         this.waveSpawnPos = Optional.empty();
-         this.id = id;
-         this.level = world;
-@@ -124,7 +124,7 @@ public class Raid {
- 
-     public Raid(ServerLevel world, CompoundTag nbt) {
-         this.raidEvent = new ServerBossEvent(Raid.RAID_NAME_COMPONENT, BossEvent.BossBarColor.RED, BossEvent.BossBarOverlay.NOTCHED_10);
--        this.random = RandomSource.create();
-+        this.random = world.plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? world.getRandom() : RandomSource.create(); // Plazma
-         this.waveSpawnPos = Optional.empty();
-         this.level = world;
-         this.id = nbt.getInt("Id");
-diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 7a3d9c1f8abdbc25e88ca35da1546725f0013c68..79f980cadddbfe234b410f25b5f0bc6edfcbba26 100644
---- a/src/main/java/net/minecraft/world/level/Explosion.java
-+++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -81,7 +81,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) {
--        this.random = RandomSource.create();
-+        this.random = world.plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? world.getRandom() : RandomSource.create(); // Plazma
-         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 058449f24eb3260dc230dad2a0b4c552d0b7f40e..cf0ad841267cac84ed058dee6cdd62a835325feb 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -125,7 +125,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     public final Thread thread;
-     private final boolean isDebug;
-     private int skyDarken;
--    protected int randValue = RandomSource.create().nextInt();
-+    protected int randValue = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceCreateRandomInstance ? java.util.concurrent.ThreadLocalRandom.current().nextInt() : RandomSource.create().nextInt(); // Plazma
-     protected final int addend = 1013904223;
-     protected float oRainLevel;
-     public float rainLevel;
-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 a4cd9869988f414ce1bf14d38442f78207e3f048..f99a7b2da94ef7b413ff10b57fa43e23398aa715 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-@@ -369,7 +369,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
-     }
- 
-     private static void spawnGatewayPortal(ServerLevel world, BlockPos pos, EndGatewayConfiguration config) {
--        Feature.END_GATEWAY.place(config, world, world.getChunkSource().getGenerator(), RandomSource.create(), pos);
-+        Feature.END_GATEWAY.place(config, world, world.getChunkSource().getGenerator(), (world.plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? world.getRandom() : RandomSource.create()), pos); // Plazma
-     }
- 
-     @Override
-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 e9eb32469a5c03f7a3677ef50fd4541c1ed662ad..75665373c291faaea1cbf5f54c3634fdb042556c 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
-@@ -411,7 +411,7 @@ public class EndDragonFight {
-         this.level.registryAccess().registry(Registries.CONFIGURED_FEATURE).flatMap((registry) -> {
-             return registry.getHolder(EndFeatures.END_GATEWAY_DELAYED);
-         }).ifPresent((reference) -> {
--            reference.value().place(this.level, this.level.getChunkSource().getGenerator(), RandomSource.create(), pos);
-+            reference.value().place(this.level, this.level.getChunkSource().getGenerator(), (this.level.plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? this.level.getRandom() : RandomSource.create()), pos); // Plazma
-         });
-     }
- 
-@@ -427,7 +427,7 @@ public class EndDragonFight {
-             this.portalLocation = this.portalLocation.atY(this.level.getMinBuildHeight() + 1);
-         }
-         // Paper end
--        endPodiumFeature.place(FeatureConfiguration.NONE, this.level, this.level.getChunkSource().getGenerator(), RandomSource.create(), this.portalLocation);
-+        endPodiumFeature.place(FeatureConfiguration.NONE, this.level, this.level.getChunkSource().getGenerator(), (this.level.plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? this.level.getRandom() : RandomSource.create()), this.portalLocation); // Plazma
-     }
- 
-     @Nullable
-diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootContext.java b/src/main/java/net/minecraft/world/level/storage/loot/LootContext.java
-index 9e9ac64764cf0a84e25e75d8d6f516cde6047284..2d197a7de77657a19b1b527c0aa53ef9918eb15f 100644
---- a/src/main/java/net/minecraft/world/level/storage/loot/LootContext.java
-+++ b/src/main/java/net/minecraft/world/level/storage/loot/LootContext.java
-@@ -202,7 +202,7 @@ public class LootContext {
-                 } else {
-                     RandomSource randomSource = this.random;
-                     if (randomSource == null) {
--                        randomSource = RandomSource.create();
-+                        randomSource = this.level.plazmaLevelConfiguration().misc.reduceCreateRandomInstance ? this.level.getRandom() : RandomSource.create();
-                     }
- 
-                     MinecraftServer minecraftServer = this.level.getServer();
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 59b9b268467b098e5c21d1d00f599cfb36154179..fa33fd5a64fadbfe6507ae9f61fdfbfc816686b5 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -39,7 +39,7 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public Misc misc;
-     public class Misc extends ConfigurationPart {
- 
--
-+        public boolean reduceCreateRandomInstance = DO_OPTIMIZE;
- 
-     }
- }
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 9416ce600d46fad167befe8d42f9a1a7d891a37f..2836447cf43e145d1fc1d24f6d054be49e9a14d9 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-@@ -87,7 +87,7 @@ public class LevelConfigurations extends ConfigurationPart {
-     public Misc misc;
-     public class Misc extends ConfigurationPart {
- 
--
-+        public boolean reduceCreateRandomInstance = DO_OPTIMIZE;
- 
-     }
- }

patches/server/0021-Don-t-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] 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 02364a148b347e3669275553004391e31d77c0b5..cd2d3707c8e4a313ad15958b2f926be6e05bcd4d 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 (player == null && org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.refreshLootTableForNonPlayerInteraction) return; // Plazma
+         if (this.level != null && this.lootableData.shouldReplenish(player) && this.level.getServer() != null) { // Paper - don't unpack loot table if not in world
+             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 d88208cb454d1042440803c817d99c5dcb775330..c687f448761a591900ae5ebad9c8dfca572e9b31 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+@@ -42,6 +42,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+ 
+         public boolean reduceRandom = OPTIMIZE;
+         public boolean ignoreThreadSafeRandom = false;
++        public boolean refreshLootTableForNonPlayerInteraction = !OPTIMIZE;
+ 
+     }
+ 

patches/server/0021-Entity-Configuration.patch

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sat, 25 Mar 2023 20:38:21 +0900
-Subject: [PATCH] Entity Configuration
-
-
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 2836447cf43e145d1fc1d24f6d054be49e9a14d9..f560db0cd544c96264ebad8af3ed3dd8379bab1b 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-@@ -90,4 +90,21 @@ public class LevelConfigurations extends ConfigurationPart {
-         public boolean reduceCreateRandomInstance = DO_OPTIMIZE;
- 
-     }
-+
-+    public Entity entity;
-+    public class Entity extends ConfigurationPart {
-+
-+        public Monster monster;
-+        public class Monster extends ConfigurationPart {
-+
-+            public Phantom phantom;
-+            public class Phantom extends ConfigurationPart {
-+
-+
-+
-+            }
-+
-+        }
-+
-+    }
- }

patches/server/0022-Don-t-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] 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..49a8a81c586908278d1e3cbd51dea307540f28ec 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.plazmaConfig().entity.phantom.loadChunksToSpawn && !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/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/0022-Various-Optimizations.patch

@@ -1,107 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sat, 25 Mar 2023 20:42:23 +0900
-Subject: [PATCH] Various Optimizations
-
-[ORIGINAL PATCHES]
-0007 - Avoid double I/O operation on load player file (Akarin)
-0008 - Don't trigger Lootable Refresh for non player interaction
-     (Akarin)
-0011 - Swaps the predicate order of collision (Akarin)
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e71eca3ddbbeb3168dd73433b6d6ffe9f6755f77..f8be2d9d454965257de55d2aa572016115d1b346 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1993,8 +1993,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     public void playerTouch(Player player) {}
- 
-     public void push(Entity entity) {
-+        if (entity.noPhysics || this.noPhysics) return; // Plazma
-         if (!this.isPassengerOfSameVehicle(entity)) {
--            if (!entity.noPhysics && !this.noPhysics) {
-+            //if (!entity.noPhysics && !this.noPhysics) { // Plazma
-                 if (this.level.paperConfig().collisions.onlyPlayersCollide && !(entity instanceof ServerPlayer || this instanceof ServerPlayer)) return; // Paper
-                 double d0 = entity.getX() - this.getX();
-                 double d1 = entity.getZ() - this.getZ();
-@@ -2023,7 +2024,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-                     }
-                 }
- 
--            }
-+            //} // Plazma
-         }
-     }
- 
-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 6d62cc8fb347ccafd51df05896e616995990f005..c26e4795afd0bd450d304f4528d0b8e4cfa761ce 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.doNotTriggerLootTableRefreshForNonPlayerInteraction && player == null) return; // Plazma
-         if (this.lootableData.shouldReplenish(player) && this.level.getServer() != null) { // Paper
-             LootTable lootTable = this.level.getServer().getLootTables().get(this.lootTable);
-             if (player instanceof ServerPlayer) {
-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 f55c50f6637a4f930b15565d6ac82bb4f27b9059..9c4e65a67bda331625a0891be10495eaae5f3f5e 100644
---- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-@@ -73,6 +73,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.monster.phantom.doNotLoadChunksToSpawn && world.hasChunkAt(blockposition1)) continue; // Plazma
-                                         BlockState iblockdata = world.getBlockState(blockposition1);
-                                         FluidState fluid = world.getFluidState(blockposition1);
- 
-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..039c952f0c157cba6e79fa9b976958bd1763a922 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 {
-             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 normalFile = file.exists() && file.isFile(); // Plazma - Avoid double I/O operation
-+            if ( org.bukkit.Bukkit.getOnlineMode() && !normalFile ) // 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 {
-             }
-             // Spigot End
- 
--            if (file.exists() && file.isFile()) {
-+            if (normalFile) { // Plazma - Avoid double I/O operation
-                 nbttagcompound = NbtIo.readCompressed(file);
-             }
-             // Spigot Start
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index fa33fd5a64fadbfe6507ae9f61fdfbfc816686b5..590afba7c588e7b9f5f9c61e91805e3dc3b62771 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -40,6 +40,7 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public class Misc extends ConfigurationPart {
- 
-         public boolean reduceCreateRandomInstance = DO_OPTIMIZE;
-+        public boolean doNotTriggerLootTableRefreshForNonPlayerInteraction = DO_OPTIMIZE;
- 
-     }
- }
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index f560db0cd544c96264ebad8af3ed3dd8379bab1b..80ee8293d73ecdb1a942ca88f1aa00813d600849 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-@@ -100,7 +100,7 @@ public class LevelConfigurations extends ConfigurationPart {
-             public Phantom phantom;
-             public class Phantom extends ConfigurationPart {
- 
--
-+                public boolean doNotLoadChunksToSpawn = DO_OPTIMIZE;
- 
-             }
- 

patches/server/0023-Add-configuration-to-disable-moved-to-quickly-check-.patch

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sat, 25 Mar 2023 20:46:40 +0900
-Subject: [PATCH] Add configuration to disable moved to quickly check for
- spectators
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index af8cb1f1f0c128923495f51e4828003133ce766b..8f911f589bf04902e38e2c625d84ba0c47cbd9ee 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1544,7 +1544,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-                             if (!this.player.isChangingDimension() && (!this.player.getLevel().getGameRules().getBoolean(GameRules.RULE_DISABLE_ELYTRA_MOVEMENT_CHECK) || !this.player.isFallFlying())) {
-                                 float f2 = this.player.isFallFlying() ? 300.0F : 100.0F;
- 
--                                if (d11 - d10 > Math.max(f2, Math.pow((double) (org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed), 2)) && !this.isSingleplayerOwner()) {
-+                                if (!(this.player.getLevel().plazmaLevelConfiguration().misc.checkSpectatorMovedToQuickly && this.player.isSpectator()) && d11 - d10 > Math.max(f2, Math.pow((double) (org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed), 2)) && !this.isSingleplayerOwner()) { // Plazma
-                                 // CraftBukkit end
-                                     ServerGamePacketListenerImpl.LOGGER.warn("{} moved too quickly! {},{},{}", new Object[]{this.player.getName().getString(), d7, d8, d9});
-                                     this.teleport(this.player.getX(), this.player.getY(), this.player.getZ(), this.player.getYRot(), this.player.getXRot());
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 80ee8293d73ecdb1a942ca88f1aa00813d600849..e6c22ab535ab8fecaadbf06d4982440fd5863f17 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-@@ -88,6 +88,7 @@ public class LevelConfigurations extends ConfigurationPart {
-     public class Misc extends ConfigurationPart {
- 
-         public boolean reduceCreateRandomInstance = DO_OPTIMIZE;
-+        public boolean checkSpectatorMovedToQuickly = DO_OPTIMIZE;
- 
-     }
- 

patches/server/0023-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 a7e82f95db5c6c054175192f019072006a3ef31f..21def42f813f00c9fbc9c920b9ba61efc5928ef6 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -1439,6 +1439,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") || !(org.plazmamc.plazma.configurations.GlobalConfiguration.get().player.checkSpectatorMovedToQuickly && this.player.isSpectator())) // 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/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+index c687f448761a591900ae5ebad9c8dfca572e9b31..f3cf7634a5fd470e7fb295ae1f88e14f0c4a0d1d 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 class Player extends ConfigurationPart {
+ 
+         public boolean allowAnyUsername = false;
++        public boolean checkSpectatorMovedToQuickly = !OPTIMIZE;
+ 
+     }
+ 

patches/server/0024-Apply-faster-random.patch

@@ -1,471 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sat, 25 Mar 2023 21:50:25 +0900
-Subject: [PATCH] Apply 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 e5ea9f27a1936ed9e329e74317c91c5df89b9fbd..7e7a4d872983cd2efdc575bc33353f94d73cc641 100644
---- a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
-+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
-@@ -13,7 +13,7 @@ import java.util.UUID;
- 
- public class PaperLootableInventoryData {
- 
--    private static final Random RANDOM = new Random();
-+    private static final Random RANDOM = Boolean.getBoolean("Plazma.doNotUseFasterRandom") ? new Random() : new org.plazmamc.plazma.Random(); // Plazma
- 
-     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 cc6968a064b30f7250d18c20efb2bb8602bb0cdd..3c80e14392ee7a6bf5040d7cb81b7d894e162eff 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -694,7 +694,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 = Boolean.getBoolean("Plazma.doNotUseFasterRandom") ? new Random() : new org.plazmamc.plazma.Random(); rand.setSeed(world.getSeed()); // Plazma
-                 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 3013aeb442799aba5b2ae45edcb3c2c72a18a740..e9f6104e0f665f29b3fca9ff0d8d48613aee2295 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 = Boolean.getBoolean("Plazma.doNotUseFasterRandom") ? new Random() : new org.plazmamc.plazma.Random(); // Plazma
- 
-     public CraftWorld(ServerLevel world, ChunkGenerator gen, BiomeProvider biomeProvider, Environment env) {
-         this.world = world;
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index d1c7ab67cba881d96b7a5e9220130d86d0514304..6018c5332410a5a0db29f35c0b4cb628df07f596 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-@@ -15,7 +15,7 @@ import org.bukkit.inventory.meta.FireworkMeta;
- 
- public class CraftFirework extends CraftProjectile implements Firework {
- 
--    private final Random random = new Random();
-+    private final Random random = Boolean.getBoolean("Plazma.doNotUseFasterRandom") ? new Random() : new org.plazmamc.plazma.Random(); // Plazma
-     //private CraftItemStack item; // Paper - Remove usage, not accurate representation of current item.
- 
-     public CraftFirework(CraftServer server, FireworkRocketEntity entity) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-index a9673a804d597599c35c83f4f245510c83005328..202ac2b0d96b870ce853959da89e82a4949ca585 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 = Boolean.getBoolean("Plazma.doNotUseFasterRandom") ? new Random() : new org.plazmamc.plazma.Random(); // Plazma
-     private boolean newApi;
-     private boolean implementBaseHeight = true;
- 
-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..e72e96be3938bdcc1ae1aa94f7465f644e1b3e16
---- /dev/null
-+++ b/src/main/java/org/plazmamc/plazma/Random.java
-@@ -0,0 +1,394 @@
-+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() {
-+        seed((int) System.currentTimeMillis());
-+    }
-+
-+    @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/0024-Implement-No-Chat-Reports.patch

@@ -0,0 +1,152 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Thu, 28 Sep 2023 11:47:50 +0900
+Subject: [PATCH] Implement No Chat Reports
+
+Implemented: 62fbdef42dfbfec551d8324b7084c4ccf248bab7
+
+diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
+index 40f51062624161892c780ddae05e22859e2cd021..b0b515b8ebeffe25a760d7d6faa87cbc1a585b2d 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) {
+         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);
+-        })));
++        // 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
+     }
+ 
+     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
+--- a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatCommandPacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatCommandPacket.java
+@@ -24,4 +24,13 @@ public record ServerboundChatCommandPacket(String command, Instant timeStamp, lo
+     public void handle(ServerGamePacketListener listener) {
+         listener.handleChatCommand(this);
+     }
++
++    // Plazma start - Implement No Chat Reports
++    @Override
++    public ArgumentSignatures argumentSignatures() {
++        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.enabled)
++            return ArgumentSignatures.EMPTY;
++        return this.argumentSignatures;
++    }
++    // Plazma end
+ }
+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
+--- a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatPacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatPacket.java
+@@ -25,4 +25,12 @@ public record ServerboundChatPacket(String message, Instant timeStamp, long salt
+     public void handle(ServerGamePacketListener listener) {
+         listener.handleChat(this);
+     }
++
++    // Plazma start - Implement No Chat Reports
++    @Override
++    public @Nullable MessageSignature signature() {
++        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.enabled) return null;
++        return this.signature;
++    }
++    // Plazma end
+ }
+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
+--- a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatSessionUpdatePacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatSessionUpdatePacket.java
+@@ -16,6 +16,15 @@ public record ServerboundChatSessionUpdatePacket(RemoteChatSession.Data chatSess
+ 
+     @Override
+     public void handle(ServerGamePacketListener listener) {
++        // Plazma start - Implement No Chat Reports
++        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.requireModInstallation()) {
++            ((net.minecraft.server.network.ServerGamePacketListenerImpl) listener).disconnect(
++                    net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.requireModInstallation.message),
++                    org.bukkit.event.player.PlayerKickEvent.Cause.NCR_NOT_INSTALLED
++            );
++            return;
++        }
++        // Plazma end
+         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 770b959d9e51ef0645415d5a0d7d79b7031abd66..f902505c850b9ea68733bd40e62b02b40a235e42 100644
+--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -681,6 +681,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+ 
+     @Override
+     public boolean enforceSecureProfile() {
++        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.enabled) return false; // Plazma - Implement No Chat Reports
+         DedicatedServerProperties dedicatedserverproperties = this.getProperties();
+         // Paper start - fix secure profile with proxy online mode
+         return dedicatedserverproperties.enforceSecureProfile
+diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+index b19c59a87d4136da583a0b687f6b27fef3456f09..b54372c32845d2bc340951c0ea88d480efc1dd6a 100644
+--- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+@@ -262,6 +262,13 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+     }
+ 
+     public void send(Packet<?> packet, @Nullable PacketSendListener callbacks) {
++        // Plazma start - Implement No Chat Reports
++        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.convertToSystemMessage()
++                && 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);
++            return;
++        }
++        // Plazma end
+         // 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 e8de78f8b7c90a719e10c483991f45a7886256be..0ff64fc50768a4bed9c871fed1089753912b89d2 100644
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+@@ -1493,6 +1493,7 @@ public abstract class PlayerList {
+     }
+ 
+     public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public
++        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.enabled) return true; // Plazma - Implement No Chat Reports
+         return message.hasSignature() && !message.hasExpiredServer(Instant.now());
+     }
+ 
+diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+index f3cf7634a5fd470e7fb295ae1f88e14f0c4a0d1d..5dafbe4ca74071e25ce79128ca08c7bfebb778d5 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+@@ -56,4 +56,22 @@ public class GlobalConfiguration extends ConfigurationPart {
+ 
+     }
+ 
++    public NoChatReports noChatReports;
++    public class NoChatReports extends ConfigurationPart {
++
++        public boolean enabled = false;
++        boolean queryData = true; public boolean queryData() { return this.enabled && this.queryData; }
++        boolean convertToSystemMessage = true; public boolean convertToSystemMessage() { return this.enabled && this.convertToSystemMessage; }
++        public boolean requireModInstallation() { return this.enabled && this.requireModInstallation.enabled; }
++
++        public RequireModInstallation requireModInstallation;
++        public class RequireModInstallation extends ConfigurationPart {
++
++            boolean enabled = false;
++            public String message = "You do not have No Chat Reports, and this server is configured to require it on client!";
++
++        }
++
++    }
++
+ }

patches/server/0025-Do-not-send-useless-entity-packets.patch

@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sat, 25 Mar 2023 22:07:39 +0900
-Subject: [PATCH] Do not send useless entity packets
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 6afee2a744a3498d4a0eee35f77cde444f73d12c..dbb987d5896e199aeae3bcd86c69bf3327af8ada 100644
---- a/src/main/java/net/minecraft/server/level/ServerEntity.java
-+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -207,6 +207,7 @@ public class ServerEntity {
-                         flag4 = true;
-                         flag5 = true;
-                     }
-+                    if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.doNotSendUselessEntityPackets && isUselessEntityPacket(packet1)) packet1 = null; // Plazma
-                 }
- 
-                 if ((this.trackDelta || this.entity.hasImpulse || this.entity instanceof LivingEntity && ((LivingEntity) this.entity).isFallFlying()) && this.tickCount > 0) {
-@@ -281,6 +282,21 @@ public class ServerEntity {
-         }));
-     }
- 
-+    // Plazma start
-+    private boolean isUselessEntityPacket(@Nullable Packet<?> packet) {
-+        if (packet == null) return false;
-+        if (packet instanceof ClientboundMoveEntityPacket p) {
-+            if (p instanceof ClientboundMoveEntityPacket.Pos)
-+                return p.getXa() == 0 && p.getYa() == 0 && p.getZa() == 0;
-+            else if (p instanceof ClientboundMoveEntityPacket.Rot)
-+                return p.getxRot() == 0 && p.getyRot() == 0;
-+            else if (p instanceof ClientboundMoveEntityPacket.PosRot)
-+                return p.getXa() == 0 && p.getYa() == 0 && p.getZa() == 0 && p.getxRot() == 0 && p.getyRot() == 0;
-+        }
-+        return false;
-+    }
-+    // Plazma end
-+
-     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/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 590afba7c588e7b9f5f9c61e91805e3dc3b62771..8ed22e178bd093241592981c06c747524ad24dc3 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -41,6 +41,7 @@ public class GlobalConfiguration extends ConfigurationPart {
- 
-         public boolean reduceCreateRandomInstance = DO_OPTIMIZE;
-         public boolean doNotTriggerLootTableRefreshForNonPlayerInteraction = DO_OPTIMIZE;
-+        public boolean doNotSendUselessEntityPackets = DO_OPTIMIZE;
- 
-     }
- }

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

@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Wed, 27 Sep 2023 22:35:19 +0900
+Subject: [PATCH] Ignore useless entity packets
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
+index c6ef510d335b8baea58c4491853414a52a06b66b..e2dcdc9f317a4ab1a9b30e482607dc041abb7035 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 {
+                         flag4 = true;
+                         flag5 = true;
+                     }
++
++                    if (this.level.plazmaConfig().entity.ignoreUselessPackets && isUselessPacket(packet1)) packet1 = null; // Plazma
+                 }
+ 
+                 if ((this.trackDelta || this.entity.hasImpulse || this.entity instanceof LivingEntity && ((LivingEntity) this.entity).isFallFlying()) && this.tickCount > 0) {
+@@ -272,6 +274,19 @@ public class ServerEntity {
+         });
+     }
+ 
++    // Plazma start
++    private boolean isUselessPacket(@Nullable Packet<?> packet) {
++        if (!(packet instanceof ClientboundMoveEntityPacket p)) return false;
++        if (p instanceof ClientboundMoveEntityPacket.Pos)
++            return p.getXa() == 0 && p.getYa() == 0 && p.getZa() == 0;
++        if (p instanceof ClientboundMoveEntityPacket.Rot)
++            return p.getxRot() == 0 && p.getyRot() == 0;
++        if (p instanceof ClientboundMoveEntityPacket.PosRot)
++            return p.getXa() == 0 && p.getYa() == 0 && p.getZa() == 0 && p.getxRot() == 0 && p.getyRot() == 0;
++        return false;
++    }
++    // Plazma end
++
+     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/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 = OPTIMIZE;
++
+         public Phantom phantom;
+         public class Phantom extends ConfigurationPart {
+ 

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

@@ -1,13 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: IPECTER <ipectert@gmail.com>
+From: AlphaKR93 <dev@alpha93.kr>
-Date: Tue, 28 Mar 2023 12:42:17 +0900
+Date: Mon, 6 Nov 2023 10:39:01 +0900
-Subject: [PATCH] Implement MemoryLeakFix
+Subject: [PATCH] Improve biome temperature cache
 
-Original: fxmorin/MemoryLeakFix
-Copyright (C) 2023 fxmorin
 
 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..2bddcaf8762ee7834c32622402a976bfad12d127 100644
+index ed439b7e94646141c93a7dd3704d1cdeb5c27e16..642fd0e06f9ab53b4ef2cafe1dc3321a3fd7ee9e 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 {
@@ -15,7 +13,7 @@ index ed439b7e94646141c93a7dd3704d1cdeb5c27e16..2bddcaf8762ee7834c32622402a976bf
      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 - MemoryLeakFix
++    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) {
@@ -24,7 +22,7 @@ index ed439b7e94646141c93a7dd3704d1cdeb5c27e16..2bddcaf8762ee7834c32622402a976bf
          long l = blockPos.asLong();
          // Pufferfish start
 -        gg.airplane.structs.Long2FloatAgingCache cache = this.temperatureCache.get();
-+        gg.airplane.structs.Long2FloatAgingCache cache = temperatureCache.get(); // Plazma - MemoryLeakFix
++        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/0026-No-Chat-Reports-Configuration.patch

@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 26 Mar 2023 13:43:01 +0900
-Subject: [PATCH] No Chat Reports Configuration
-
-
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 8ed22e178bd093241592981c06c747524ad24dc3..0e8d5b01a673ba826c943fcb33552518022a2ea3 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -43,5 +43,12 @@ public class GlobalConfiguration extends ConfigurationPart {
-         public boolean doNotTriggerLootTableRefreshForNonPlayerInteraction = DO_OPTIMIZE;
-         public boolean doNotSendUselessEntityPackets = DO_OPTIMIZE;
- 
-+    }
-+
-+    public NoChatReports noChatReports;
-+    public class NoChatReports extends ConfigurationPart {
-+
-+
-+
-     }
- }

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

@@ -0,0 +1,34 @@
+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 aeae6117b398b84d5c8ecaa175a72867416ff166..c9df97eebe3635009737be83a28f36d291fcce79 100644
+--- a/src/main/java/net/minecraft/world/entity/Mob.java
++++ b/src/main/java/net/minecraft/world/entity/Mob.java
+@@ -936,10 +936,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().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/0027-Implement-No-Chat-Reports.patch

@@ -1,139 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 26 Mar 2023 13:48:48 +0900
-Subject: [PATCH] Implement No Chat Reports
-
-
-diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-index 1f4b64a5f812376c499c98cb4be62469bd0b7dbe..c0bd2997fe3ebbfe926de832a36d209cc875f3e2 100644
---- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-+++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-@@ -147,18 +147,23 @@ public class FriendlyByteBuf extends ByteBuf {
-     public <T> T readJsonWithCodec(Codec<T> codec) {
-         JsonElement jsonelement = (JsonElement) GsonHelper.fromJson(FriendlyByteBuf.GSON, this.readUtf(), JsonElement.class);
-         DataResult<T> dataresult = codec.parse(JsonOps.INSTANCE, jsonelement);
--
--        return Util.getOrThrow(dataresult, (s) -> {
--            return new DecoderException("Failed to decode json: " + s);
--        });
-+        // Plazma start - NCR
-+        T result = Util.getOrThrow(dataresult, (s) -> new DecoderException("Failed to decode json: " + s));
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.addQueryData() && jsonelement.getAsJsonObject().has("preventsChatReports"))
-+            ((net.minecraft.network.protocol.status.ServerStatus) result).setPreventsChatReports(jsonelement.getAsJsonObject().get("preventsChatReports").getAsBoolean());
-+        return result;
-+        // Plazma end
-     }
- 
-     public <T> void writeJsonWithCodec(Codec<T> codec, T value) {
-         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);
--        })));
-+        // Plazma start - NCR
-+        JsonElement element = Util.getOrThrow(dataresult, (s) -> new EncoderException("Failed to encode: " + s + " " + value));
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.addQueryData() && codec == net.minecraft.network.protocol.status.ServerStatus.CODEC)
-+            element.getAsJsonObject().addProperty("preventsChatReports", true);
-+        this.writeUtf(FriendlyByteBuf.GSON.toJson(element));
-+        // Plazma end
-     }
- 
-     public <T> void writeId(IdMap<T> registry, T value) {
-diff --git a/src/main/java/net/minecraft/network/protocol/status/ServerStatus.java b/src/main/java/net/minecraft/network/protocol/status/ServerStatus.java
-index e6cc2bab1fde2e8c1394772b99201ea8d7eb8057..2ba3291f6c82f633d7ed7b150f2ae3c28d74b21e 100644
---- a/src/main/java/net/minecraft/network/protocol/status/ServerStatus.java
-+++ b/src/main/java/net/minecraft/network/protocol/status/ServerStatus.java
-@@ -64,4 +64,21 @@ public record ServerStatus(Component description, Optional<ServerStatus.Players>
-             return new ServerStatus.Version(worldVersion.getName(), worldVersion.getProtocolVersion());
-         }
-     }
-+
-+    // Plazma start - NCR
-+    public boolean enforcesSecureChat() {
-+        return org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.enabled || this.enforcesSecureChat;
-+    }
-+
-+    private static boolean preventsChatReports;
-+
-+    public boolean preventsChatReports() {
-+        if (this.version().isPresent() && this.version().get().protocol() < 759 && this.version().get().protocol() > 0) return true;
-+        return this.preventsChatReports;
-+    }
-+
-+    public void setPreventsChatReports(boolean prevents) {
-+        this.preventsChatReports = prevents;
-+    }
-+    // Plazma end
- }
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 84bb45aef3c2087cb9c03a99184956c484b3d8e9..778b79ce3530781705f6d6ae11a2631f186e3763 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -684,7 +684,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
- 
-     @Override
-     public boolean enforceSecureProfile() {
--        return this.getProperties().enforceSecureProfile && this.getProperties().onlineMode;
-+        return !org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.enabled && this.getProperties().enforceSecureProfile && this.getProperties().onlineMode; // Plazma - NCR
-     }
- 
-     protected boolean convertOldUsers() {
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8f911f589bf04902e38e2c625d84ba0c47cbd9ee..b15de37a06c3efb1c4bc790ccb23ebff3c97d54d 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2235,10 +2235,19 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
- 
-     @Override
-     public void send(Packet<?> packet) {
-+        // Plazma start - NCR
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.convertToGameMessage() && packet instanceof ClientboundPlayerChatPacket chat)
-+            packet = new ClientboundSystemChatPacket(null, Component.Serializer.toJson(chat.chatType().resolve(this.player.level.registryAccess()).get().decorate(chat.unsignedContent() != null ? chat.unsignedContent() : Component.literal(chat.body().content()))), false);
-         this.send(packet, (PacketSendListener) null);
-     }
- 
-     public void send(Packet<?> packet, @Nullable PacketSendListener callbacks) {
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.convertToGameMessage() && packet instanceof ClientboundPlayerChatPacket p && callbacks != null) {
-+            this.send(p);
-+            return;
-+        }
-+        // Plazma end
-+
-         // 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 b22b86d7f226e0e24d6be27ea33ec9d690f8f238..022da50912d357581b2132cf57e1a767e436022c 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1464,7 +1464,7 @@ public abstract class PlayerList {
-     }
- 
-     public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public
--        return message.hasSignature() && !message.hasExpiredServer(Instant.now());
-+        return org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.enabled || (message.hasSignature() && !message.hasExpiredServer(Instant.now())); // Plazma - NCR
-     }
- 
-     // CraftBukkit start
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 0e8d5b01a673ba826c943fcb33552518022a2ea3..17454a128f7ef53428920f95e4709180fd8efb32 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -48,7 +48,17 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public NoChatReports noChatReports;
-     public class NoChatReports extends ConfigurationPart {
- 
-+        public boolean enabled = false;
-+        boolean addQueryData = true;
-+        boolean convertToGameMessage = true;
- 
-+        public boolean addQueryData() {
-+            return enabled && addQueryData;
-+        }
-+
-+        public boolean convertToGameMessage() {
-+            return enabled && convertToGameMessage;
-+        }
- 
-     }
- }

patches/server/0028-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 58609a0911c4e32b6f80f050cd3d23f70ad75b1b..2db6c1b9530b4b082ef6f6ec17c542ba8ad7fa5f 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
++        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
+         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 5dafbe4ca74071e25ce79128ca08c7bfebb778d5..3cfb9357d0c61e84488c2c60f073fa12df942b8e 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: " + this.customSeaBlock, ", defaulting to lava");
++                            return net.minecraft.world.level.block.Blocks.LAVA;
++                        })
++                        .defaultBlockState();
++            }
++
++        }
+ 
+     }
+ 

patches/server/0028-FixMySpawnR-Configuration.patch

@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: IPECTER <ipectert@gmail.com>
-Date: Sun, 26 Mar 2023 16:20:13 +0900
-Subject: [PATCH] FixMySpawnR Configuration
-
-
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 17454a128f7ef53428920f95e4709180fd8efb32..39eca4acefa8f9cf143398cfc6cf157e8489947e 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -61,4 +61,12 @@ public class GlobalConfiguration extends ConfigurationPart {
-         }
- 
-     }
-+
-+    public FixMySpawnR fixMySpawnR;
-+    public class FixMySpawnR extends ConfigurationPart {
-+
-+        public boolean enabled = DO_OPTIMIZE;
-+        public int timerTimeOut = 0;
-+
-+    }
- }

patches/server/0029-Implement-FixMySpawnR.patch

@@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: IPECTER <ipectert@gmail.com>
-Date: Sun, 26 Mar 2023 13:17:24 +0900
-Subject: [PATCH] Implement FixMySpawnR
-
-Original: AbsolemJackdaw/FixMySpawnR
-Copyright (C) 2023 AbsolemJackdaw
-
-diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index feb65fc9ee04141fe6f77400660442ed207547a1..9c759e71ef1d119d7807886f9e56b7230a334475 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
-+    private boolean blockLockedByTime = false; // Plazma
- 
-     public BaseSpawner() {}
- 
-@@ -81,6 +83,18 @@ public abstract class BaseSpawner {
-     }
- 
-     public void serverTick(ServerLevel world, BlockPos pos) {
-+        // Plazma start - FixMySpawnR
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().fixMySpawnR.enabled) {
-+            if (!blockLockedByTime) {
-+                if (blockExistsTick > org.plazmamc.plazma.configurations.GlobalConfiguration.get().fixMySpawnR.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;
-@@ -292,6 +306,13 @@ public abstract class BaseSpawner {
-             this.spawnRange = nbt.getShort("SpawnRange");
-         }
- 
-+        // Plazma start - FixMySpawnR
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().fixMySpawnR.enabled && nbt.contains("SpawnRange", 99)) {
-+            this.blockExistsTick = nbt.getInt("fixmyspawnrTicks");
-+            this.blockLockedByTime = nbt.getBoolean("fixMySpawnerLocked");
-+        }
-+        // Plazma end
-+
-         this.displayEntity = null;
-     }
- 
-@@ -321,6 +342,12 @@ public abstract class BaseSpawner {
-         }
- 
-         nbt.put("SpawnPotentials", (Tag) SpawnData.LIST_CODEC.encodeStart(NbtOps.INSTANCE, this.spawnPotentials).result().orElseThrow());
-+        // Plazma start - FixMySpawnR
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().fixMySpawnR.enabled) {
-+            nbt.putInt("fixmyspawnrTicks", blockExistsTick);
-+            nbt.putBoolean("fixMySpawnerLocked", blockLockedByTime);
-+        }
-+        // Plazma end
-         return nbt;
-     }
- 

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

@@ -0,0 +1,76 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+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/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 {
++
++            private double defaultValue() {
++                return OPTIMIZE ? 0.2 : 0.0;
++            }
++
++            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); }
++
++        }
++
+     }
+ 
+     public Structure structure;
+diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
+index 0b03dae85e6008283e68b07fa438daccf0e4f5fa..5b981300a8addb85fce32b814dfe70cb2bc4beb3 100644
+--- a/src/main/java/org/spigotmc/ActivationRange.java
++++ b/src/main/java/org/spigotmc/ActivationRange.java
+@@ -68,29 +68,36 @@ public class ActivationRange
+         Activity.PANIC
+     };
+ 
++    // Plazma start - Variable entity wakeup duration
++    private static int getWakeupDuration(net.minecraft.util.RandomSource random, int duration, double deviation) {
++        if (deviation == 0) return duration;
++        return (int) Math.min(Integer.MAX_VALUE, Math.max(1, Math.round(duration * (1 + deviation * random.nextGaussian()))));
++    }
++    // Plazma end
+     private static int checkInactiveWakeup(Entity entity) {
+         Level world = entity.level();
+         SpigotWorldConfig config = world.spigotConfig;
++        org.plazmamc.plazma.configurations.WorldConfigurations plazmaConfig = world.plazmaConfig(); // Plazma
+         long inactiveFor = MinecraftServer.currentTick - entity.activatedTick;
+         if (entity.activationType == ActivationType.VILLAGER) {
+             if (inactiveFor > config.wakeUpInactiveVillagersEvery && world.wakeupInactiveRemainingVillagers > 0) {
+                 world.wakeupInactiveRemainingVillagers--;
+-                return config.wakeUpInactiveVillagersFor;
++                return getWakeupDuration(world.getRandom(), config.wakeUpInactiveVillagersFor, plazmaConfig.entity.wakeUpDurationVariance.villager()); // Plazma
+             }
+         } else if (entity.activationType == ActivationType.ANIMAL) {
+             if (inactiveFor > config.wakeUpInactiveAnimalsEvery && world.wakeupInactiveRemainingAnimals > 0) {
+                 world.wakeupInactiveRemainingAnimals--;
+-                return config.wakeUpInactiveAnimalsFor;
++                return getWakeupDuration(world.getRandom(), config.wakeUpInactiveAnimalsFor, plazmaConfig.entity.wakeUpDurationVariance.animal()); // Plazma
+             }
+         } else if (entity.activationType == ActivationType.FLYING_MONSTER) {
+             if (inactiveFor > config.wakeUpInactiveFlyingEvery && world.wakeupInactiveRemainingFlying > 0) {
+                 world.wakeupInactiveRemainingFlying--;
+-                return config.wakeUpInactiveFlyingFor;
++                return getWakeupDuration(world.getRandom(), config.wakeUpInactiveFlyingFor, plazmaConfig.entity.wakeUpDurationVariance.flying()); // Plazma
+             }
+         } else if (entity.activationType == ActivationType.MONSTER || entity.activationType == ActivationType.RAIDER) {
+             if (inactiveFor > config.wakeUpInactiveMonstersEvery && world.wakeupInactiveRemainingMonsters > 0) {
+                 world.wakeupInactiveRemainingMonsters--;
+-                return config.wakeUpInactiveMonstersFor;
++                return getWakeupDuration(world.getRandom(), config.wakeUpInactiveMonstersFor, plazmaConfig.entity.wakeUpDurationVariance.monster()); // Plazma
+             }
+         }
+         return -1;

patches/server/0030-Optimise-state-lookup-more.patch

@@ -0,0 +1,57 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+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..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
+     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..669c42f1598e2a06bb0b95aa0bc413911346f3ff 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,6 +114,12 @@ public abstract class StateHolder<O, S> {
+     }
+ 
+     public <T extends Comparable<T>, V extends T> S trySetValue(Property<T> property, V value) {
++        // 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
+         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
+             throw new IllegalStateException();
+         } else {
+             Table<Property<?>, Comparable<?>, S> table = HashBasedTable.create();
+@@ -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); // Plazma - Optimize state lookup more
+         }
+     }
+ 

patches/server/0031-Reduce-Sensor-Work.patch

@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: IPECTER <ipectert@gmail.com>
-Date: Wed, 3 May 2023 16:51:49 +0900
-Subject: [PATCH] Reduce Sensor Work
-
-Original: Bloom-host/Petal
-Copyright (C) 2023 peaches94
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b67660cda74a4754d1701e746aca99bde868c150..8dcc8ea2450ee14880e2ffff0f013ccee9b33e2f 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1020,20 +1020,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
-         }
- 
-         if (entity != null) {
--            ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
-+            // ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD); // Plazma - check head itemstack only when needed
-             EntityType<?> entitytypes = entity.getType();
- 
-             // Purpur start
--            if (entitytypes == EntityType.SKELETON && itemstack.is(Items.SKELETON_SKULL)) {
-+            if (entitytypes == EntityType.SKELETON && this.getItemBySlot(EquipmentSlot.HEAD).is(Items.SKELETON_SKULL)) { // Plazma
-                 d0 *= entity.level.purpurConfig.skeletonHeadVisibilityPercent;
-             }
--            else if (entitytypes == EntityType.ZOMBIE && itemstack.is(Items.ZOMBIE_HEAD)) {
-+            else if (entitytypes == EntityType.ZOMBIE && this.getItemBySlot(EquipmentSlot.HEAD).is(Items.ZOMBIE_HEAD)) { // Plazma
-                 d0 *= entity.level.purpurConfig.zombieHeadVisibilityPercent;
-             }
--            else if (entitytypes == EntityType.CREEPER && itemstack.is(Items.CREEPER_HEAD)) {
-+            else if (entitytypes == EntityType.CREEPER && this.getItemBySlot(EquipmentSlot.HEAD).is(Items.CREEPER_HEAD)) { // Plazma
-                 d0 *= entity.level.purpurConfig.creeperHeadVisibilityPercent;
-             }
--            else if ((entitytypes == EntityType.PIGLIN || entitytypes == EntityType.PIGLIN_BRUTE) && itemstack.is(Items.PIGLIN_HEAD)) {
-+            else if ((entitytypes == EntityType.PIGLIN || entitytypes == EntityType.PIGLIN_BRUTE) && this.getItemBySlot(EquipmentSlot.HEAD).is(Items.PIGLIN_HEAD)) { // Plazma
-                 d0 *= entity.level.purpurConfig.piglinHeadVisibilityPercent;
-             }
-             // Purpur end

patches/server/0031-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 e2dcdc9f317a4ab1a9b30e482607dc041abb7035..085dfb2cf8596f5f0be4b1bf9a3cbe1a0e9b2967 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 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
+@@ -406,7 +407,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/0032-Configurable-Sensor-Tick.patch

@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: IPECTER <ipectert@gmail.com>
-Date: Wed, 3 May 2023 16:51:49 +0900
-Subject: [PATCH] Configurable Sensor Tick
-
-Original: Bloom-host/Petal
-Copyright (C) 2023 peaches94
-
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 8e2274f7dce34e0997356205cf96e46f8d41cca1..3a365d7efd439cb8ddb99381bd714fb48896f4d2 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -932,10 +932,10 @@ public abstract class Mob extends LivingEntity implements Targeting {
-         }
-         // Paper end
-         //this.level.getProfiler().push("sensing"); // Purpur
--        this.sensing.tick();
-+        // Plazma - Configurable Sensor Tick
-         //this.level.getProfiler().pop(); // Purpur
-         int i = this.level.getServer().getTickCount() + this.getId();
--
-+        if (i % this.level.plazmaLevelConfiguration().entity.sensor.tick == 0) this.sensing.tick(); // Plazma - Configurable 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/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index e6c22ab535ab8fecaadbf06d4982440fd5863f17..185e2627596314d979188468f838d008442f2d2e 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-@@ -107,5 +107,12 @@ public class LevelConfigurations extends ConfigurationPart {
- 
-         }
- 
-+        public Sensor sensor;
-+        public class Sensor extends ConfigurationPart {
-+
-+            public int tick = DO_OPTIMIZE ? 10 : 1;
-+
-+        }
-+
-     }
- }

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

@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+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..23594fb7eb4b2f33146592866608c2858ef23937 100644
+--- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
++++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
+@@ -36,15 +36,16 @@ class PaperEventManager {
+ 
+     // SimplePluginManager
+     public void callEvent(@NotNull Event event) {
++        // Plazma start - Skip event if no listeners
++        RegisteredListener[] listeners = event.getHandlers().getRegisteredListeners();
++        if (listeners.length == 0) return;
++        // 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.");
+         }
+ 
+-        HandlerList handlers = event.getHandlers();
+-        RegisteredListener[] listeners = handlers.getRegisteredListeners();
+-
+         for (RegisteredListener registration : listeners) {
+             if (!registration.getPlugin().isEnabled()) {
+                 continue;