refactor: perform various code cleanup

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -8,7 +8,7 @@ body:
       value: |
         Thanks for taking the time to fill out this bug report for PlotSquared! Fill out the following form to your best ability to help us fix the problem.
         Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://intellectualsites.github.io/plotsquared-documentation/).
-        Do NOT use the public issue tracker to report security vulnerabilities! They are disclosed using [this](https://github.com/IntellectualSites/PlotSquared/security/policy) GitHub form!
+        Do NOT use the public issue tracker to report security vulnerabilities! They are disclosed using [this](https://forms.gle/btgdRn9yhGtzEiGW8) form!
 
   - type: dropdown
     attributes:
@@ -27,9 +27,6 @@ body:
       description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
       multiple: false
       options:
-        - '1.20.1'
-        - '1.20'
-        - '1.19.4'
         - '1.19.3'
         - '1.19.2'
         - '1.19.1'

.github/workflows/announce-release-on-discord.yml

@@ -1,7 +1,8 @@
 name: Announce release on discord
 on:
   release:
-    types: [ published ]
+    types: [published]
+
 jobs:
   send_announcement:
     runs-on: ubuntu-latest

.github/workflows/build-pr.yml

@@ -1,5 +1,7 @@
 name: Build PR
+
 on: [ pull_request ]
+
 jobs:
   build_pr:
     if: github.repository_owner == 'IntellectualSites'

.github/workflows/build.yml

@@ -1,8 +1,10 @@
 name: build
+
 on:
   push:
     branches:
-      - main
+      - v7
+
 jobs:
   build:
     if: github.repository_owner == 'IntellectualSites'
@@ -28,7 +30,7 @@ jobs:
             echo "STATUS=release" >> $GITHUB_ENV
           fi
       - name: Publish Release
-        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
+        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
         run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
         env:
           ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
@@ -36,13 +38,14 @@ jobs:
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
       - name: Publish Snapshot
-        if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7' }}
         run: ./gradlew publishToSonatype
         env:
           ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
           ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
       - name: Publish core javadoc
-       # if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
+       # if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
+        if: ${{ runner.os == 'Linux' && env.STATUS == 'snapshot' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
         uses: cpina/github-action-push-to-another-repository@main
         env:
           SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
@@ -54,7 +57,8 @@ jobs:
           target-branch: main
           target-directory: v7/core
       - name: Publish bukkit javadoc
-      #  if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
+       # if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
+        if: ${{ runner.os == 'Linux' && env.STATUS == 'snapshot' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
         uses: cpina/github-action-push-to-another-repository@main
         env:
           SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}

.github/workflows/codeql.yml

@@ -1,10 +1,11 @@
 name: "CodeQL"
+
 on:
   push:
-    branches: [ main ]
+    branches: [ v7 ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ main ]
+    branches: [ v7 ]
 
 jobs:
   analyze:
@@ -14,23 +15,23 @@ jobs:
       actions: read
       contents: read
       security-events: write
+
     strategy:
       fail-fast: false
       matrix:
         language: [ 'java' ]
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
-      - name: Setup Java
+
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 17
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
+
       - name: Autobuild
         uses: github/codeql-action/autobuild@v2
+
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2

.github/workflows/release-drafter.yml

@@ -1,12 +1,14 @@
 name: draft release
+
 on:
   push:
     branches:
-      - main
+      - v6
   pull_request:
     types: [ opened, reopened, synchronize ]
   pull_request_target:
     types: [ opened, reopened, synchronize ]
+
 jobs:
   update_release_draft:
     if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}

.gitignore

@@ -137,7 +137,3 @@ docs/
 build/
 
 .DS_Store
-# Ignore run folders
-run-[0-0].[0-9]/
-run-[0-0].[0-9].[0-9]/
-

.idea/icon.svg

@@ -1,144 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" id="svg2" xml:space="preserve" width="4000" height="3333.3333" viewBox="0 0 4000 3333.3333" sodipodi:docname="PlotSquared.ai">
-   version="1.1"
+		<metadata id="metadata8">
-   id="svg2"
-   xml:space="preserve"
-   width="512"
-   height="512"
-   viewBox="0 0 512 512.00001"
-   sodipodi:docname="icon.svg"
-   inkscape:version="1.1.2 (b8e25be8, 2022-02-05)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-		<metadata
-   id="metadata8">
 			<rdf:RDF>
-				<cc:Work
+				<cc:Work rdf:about="">
-   rdf:about="">
 					<dc:format>image/svg+xml</dc:format>
-                    <dc:type
+                    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-   rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
 				</cc:Work>
 			</rdf:RDF>
 		</metadata>
-    <defs
+    <defs id="defs6">
-   id="defs6">
+			<clipPath clipPathUnits="userSpaceOnUse" id="clipPath18">
-			<clipPath
+				<path d="M 0,2500 H 3000 V 0 H 0 Z" id="path16" />
-   clipPathUnits="userSpaceOnUse"
-   id="clipPath18">
-				<path
-   d="M 0,2500 H 3000 V 0 H 0 Z"
-   id="path16" />
 			</clipPath>
 		</defs>
-    <sodipodi:namedview
+    <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" id="namedview4" />
-   pagecolor="#ffffff"
+    <g id="g10" inkscape:groupmode="layer" inkscape:label="PlotSquared" transform="matrix(1.3333333,0,0,-1.3333333,0,3333.3333)">
-   bordercolor="#666666"
+			<g id="g12">
-   borderopacity="1"
+				<g id="g14" clip-path="url(#clipPath18)">
-   objecttolerance="10"
+					<g id="g20" transform="translate(1486.1511,2242.6453)">
-   gridtolerance="10"
+						<path d="m 0,0 c 16.533,10.846 33.211,21.453 50.104,31.699 78.972,-48.281 153.985,-102.704 227.269,-159.144 148.61,-115.422 287.884,-243.01 414.393,-382.333 111.39,-122.861 212.751,-255.152 298.898,-396.971 52.744,-87.322 100.544,-177.884 139.514,-272.214 -11.638,-3.551 -23.108,-7.655 -34.362,-12.286 l -0.24,0.288 c -11.135,12.982 -24.141,24.212 -34.915,37.506 -22.557,23.013 -45.425,45.737 -68.03,68.678 -19.725,20.253 -40.601,39.45 -58.958,60.974 -36.355,36.451 -72.517,73.093 -108.944,109.471 -22.628,26.013 -48.064,49.385 -71.965,74.197 -19.029,19.485 -38.706,38.346 -57.519,57.999 -12.166,14.998 -26.684,27.716 -39.93,41.658 -27.668,27.524 -54.903,55.479 -82.571,82.979 -23.924,27.956 -51.664,52.264 -76.692,79.164 -4.68,4.487 -8.855,10.774 -15.886,11.326 -22.34,34.027 -58.311,57.327 -97.377,67.502 -104.312,99.153 -215.487,191.202 -332.661,274.782 -117.942,-83.94 -229.476,-176.781 -334.484,-276.39 -26.684,-0.024 -53.368,0.024 -80.076,-0.024 0.024,-26.564 0.048,-53.104 0,-79.668 -72.229,-73.021 -139.491,-150.937 -202.385,-232.092 -63.758,-82.619 -121.973,-169.51 -173.541,-260.264 131.932,-69.061 257.864,-149.521 375.926,-240.275 0.096,-26.444 -0.12,-52.888 0.096,-79.332 l 0.744,-0.984 c 20.109,-24.14 43.409,-45.233 65.126,-67.861 15.118,-15.382 30.571,-30.404 45.569,-45.881 17.565,-20.733 37.698,-39.042 56.607,-58.503 19.917,-20.781 41.25,-40.218 59.967,-62.151 29.156,-29.299 58.167,-58.815 87.515,-87.922 29.155,-33.043 61.502,-63.111 92.169,-94.738 13.726,-12.67 25.124,-27.571 38.634,-40.457 25.029,-25.365 50.129,-50.657 75.325,-75.853 -37.914,-51.208 -73.741,-103.952 -107.192,-158.183 -167.83,273.317 -397.235,507.305 -662.37,687.158 -81.875,55.335 -167.23,105.584 -255.681,149.641 -52.815,26.276 -106.831,50.248 -162.239,70.381 99.393,233.628 242.795,446.715 410.289,636.79 93.562,106.088 194.634,205.433 301.466,298.13 C -217.335,-155.808 -111.439,-73.789 0,0" style="fill:#062f4c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path22" />
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1440"
-   inkscape:window-height="900"
-   id="namedview4"
-   inkscape:pagecheckerboard="0"
-   showgrid="false"
-   inkscape:zoom="0.1632"
-   inkscape:cx="1087.6225"
-   inkscape:cy="1666.6666"
-   inkscape:window-x="0"
-   inkscape:window-y="0"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="g10" />
-    <g
-   id="g10"
-   inkscape:groupmode="layer"
-   inkscape:label="PlotSquared"
-   transform="matrix(1.3333333,0,0,-1.3333333,0,3333.3333)">
-			<g
-   id="g12"
-   transform="matrix(0.16955078,0,0,0.16955078,-68.456969,2101.8529)">
-				<g
-   id="g14"
-   clip-path="url(#clipPath18)">
-					<g
-   id="g20"
-   transform="translate(1486.1511,2242.6453)">
-						<path
-   d="m 0,0 c 16.533,10.846 33.211,21.453 50.104,31.699 78.972,-48.281 153.985,-102.704 227.269,-159.144 148.61,-115.422 287.884,-243.01 414.393,-382.333 111.39,-122.861 212.751,-255.152 298.898,-396.971 52.744,-87.322 100.544,-177.884 139.514,-272.214 -11.638,-3.551 -23.108,-7.655 -34.362,-12.286 l -0.24,0.288 c -11.135,12.982 -24.141,24.212 -34.915,37.506 -22.557,23.013 -45.425,45.737 -68.03,68.678 -19.725,20.253 -40.601,39.45 -58.958,60.974 -36.355,36.451 -72.517,73.093 -108.944,109.471 -22.628,26.013 -48.064,49.385 -71.965,74.197 -19.029,19.485 -38.706,38.346 -57.519,57.999 -12.166,14.998 -26.684,27.716 -39.93,41.658 -27.668,27.524 -54.903,55.479 -82.571,82.979 -23.924,27.956 -51.664,52.264 -76.692,79.164 -4.68,4.487 -8.855,10.774 -15.886,11.326 -22.34,34.027 -58.311,57.327 -97.377,67.502 -104.312,99.153 -215.487,191.202 -332.661,274.782 -117.942,-83.94 -229.476,-176.781 -334.484,-276.39 -26.684,-0.024 -53.368,0.024 -80.076,-0.024 0.024,-26.564 0.048,-53.104 0,-79.668 -72.229,-73.021 -139.491,-150.937 -202.385,-232.092 -63.758,-82.619 -121.973,-169.51 -173.541,-260.264 131.932,-69.061 257.864,-149.521 375.926,-240.275 0.096,-26.444 -0.12,-52.888 0.096,-79.332 l 0.744,-0.984 c 20.109,-24.14 43.409,-45.233 65.126,-67.861 15.118,-15.382 30.571,-30.404 45.569,-45.881 17.565,-20.733 37.698,-39.042 56.607,-58.503 19.917,-20.781 41.25,-40.218 59.967,-62.151 29.156,-29.299 58.167,-58.815 87.515,-87.922 29.155,-33.043 61.502,-63.111 92.169,-94.738 13.726,-12.67 25.124,-27.571 38.634,-40.457 25.029,-25.365 50.129,-50.657 75.325,-75.853 -37.914,-51.208 -73.741,-103.952 -107.192,-158.183 -167.83,273.317 -397.235,507.305 -662.37,687.158 -81.875,55.335 -167.23,105.584 -255.681,149.641 -52.815,26.276 -106.831,50.248 -162.239,70.381 99.393,233.628 242.795,446.715 410.289,636.79 93.562,106.088 194.634,205.433 301.466,298.13 C -217.335,-155.808 -111.439,-73.789 0,0"
-   style="fill:#062f4c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-   id="path22" />
 					</g>
-                    <g
+                    <g id="g24" transform="translate(1201.7948,1741.5303)">
-   id="g24"
+						<path d="M 0,0 C 105.008,99.609 216.543,192.45 334.485,276.39 451.659,192.81 562.833,100.76 667.146,1.608 c -34.987,8.83 -71.51,9.718 -107.264,6.431 -41.202,-4.296 -82.907,-19.077 -112.543,-48.953 -33.019,-32.155 -49.456,-77.604 -55.311,-122.501 -28.124,27.908 -56.104,55.983 -84.035,84.083 -2.976,2.976 -6.839,4.823 -10.391,6.911 -19.029,26.348 -45.953,46.673 -76.62,57.495 C 187.555,-2.472 151.513,-0.12 116.166,0 Z" style="fill:#4c8fcc;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26" />
-   transform="translate(1201.7948,1741.5303)">
-						<path
-   d="M 0,0 C 105.008,99.609 216.543,192.45 334.485,276.39 451.659,192.81 562.833,100.76 667.146,1.608 c -34.987,8.83 -71.51,9.718 -107.264,6.431 -41.202,-4.296 -82.907,-19.077 -112.543,-48.953 -33.019,-32.155 -49.456,-77.604 -55.311,-122.501 -28.124,27.908 -56.104,55.983 -84.035,84.083 -2.976,2.976 -6.839,4.823 -10.391,6.911 -19.029,26.348 -45.953,46.673 -76.62,57.495 C 187.555,-2.472 151.513,-0.12 116.166,0 Z"
-   style="fill:#4c8fcc;fill-opacity:1;fill-rule:nonzero;stroke:none"
-   id="path26" />
 					</g>
-                    <g
+                    <g id="g28" transform="translate(919.3342,1429.7462)">
-   id="g28"
+						<path d="m 0,0 c 62.894,81.156 130.156,159.072 202.385,232.092 0.048,-244.21 0.024,-488.421 0,-732.631 C 84.323,-409.785 -41.61,-329.325 -173.541,-260.264 -121.973,-169.51 -63.758,-82.619 0,0" style="fill:#4c8fcc;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path30" />
-   transform="translate(919.3342,1429.7462)">
-						<path
-   d="m 0,0 c 62.894,81.156 130.156,159.072 202.385,232.092 0.048,-244.21 0.024,-488.421 0,-732.631 C 84.323,-409.785 -41.61,-329.325 -173.541,-260.264 -121.973,-169.51 -63.758,-82.619 0,0"
-   style="fill:#4c8fcc;fill-opacity:1;fill-rule:nonzero;stroke:none"
-   id="path30" />
 					</g>
-                    <g
+                    <g id="g32" transform="translate(1649.134,1700.6166)">
-   id="g32"
+						<path d="m 0,0 c 29.635,29.875 71.341,44.657 112.543,48.952 35.754,3.288 72.277,2.4 107.263,-6.431 39.066,-10.174 75.037,-33.474 97.377,-67.501 11.879,-17.661 20.181,-37.411 26.42,-57.687 10.871,-38.802 11.95,-79.356 11.446,-119.358 -44.345,-0.072 -88.69,0.048 -133.035,-0.072 -1.032,30.907 3.263,63.686 -10.175,92.626 -9.526,20.325 -32.107,31.243 -53.751,32.131 -21.453,1.44 -45.065,-4.32 -59.175,-21.597 -12.79,-15.861 -15.382,-37.002 -16.558,-56.655 -1.295,-29.132 3.696,-59.031 17.518,-84.923 16.821,-30.619 39.378,-57.783 64.526,-81.9 31.387,-32.634 67.501,-60.374 97.857,-94.041 27.332,-28.988 51.256,-61.479 68.005,-97.785 20.541,-41.13 26.972,-87.827 25.82,-133.372 -0.912,-32.107 -5.231,-64.406 -16.149,-94.737 -11.59,-31.699 -31.123,-61.047 -58.335,-81.371 -25.124,-19.125 -55.696,-29.852 -86.651,-34.771 -49.552,-6.743 -101.888,-4.847 -148.465,14.854 -35.227,14.829 -64.238,42.689 -81.708,76.548 -20.996,40.242 -27.115,86.339 -27.259,131.212 0.048,17.829 0,35.658 0.048,53.463 44.345,0.048 88.69,-0.023 133.059,0.048 1.728,-35.538 -4.055,-72.06 5.663,-106.807 5.783,-22.173 26.204,-37.794 48.185,-41.754 20.733,-3.431 43.577,-2.015 61.622,9.791 15.502,9.43 23.949,26.78 26.78,44.225 5.903,35.922 1.872,74.293 -15.381,106.688 -16.918,30.595 -39.474,57.711 -64.55,81.899 -33.187,34.099 -71.173,63.254 -102.585,99.081 -26.756,28.867 -49.408,61.646 -65.486,97.641 -24.572,52.48 -26.731,112.422 -20.18,169.102 C -49.456,-77.604 -33.019,-32.155 0,0" style="fill:#feeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34" />
-   transform="translate(1649.134,1700.6166)">
-						<path
-   d="m 0,0 c 29.635,29.875 71.341,44.657 112.543,48.952 35.754,3.288 72.277,2.4 107.263,-6.431 39.066,-10.174 75.037,-33.474 97.377,-67.501 11.879,-17.661 20.181,-37.411 26.42,-57.687 10.871,-38.802 11.95,-79.356 11.446,-119.358 -44.345,-0.072 -88.69,0.048 -133.035,-0.072 -1.032,30.907 3.263,63.686 -10.175,92.626 -9.526,20.325 -32.107,31.243 -53.751,32.131 -21.453,1.44 -45.065,-4.32 -59.175,-21.597 -12.79,-15.861 -15.382,-37.002 -16.558,-56.655 -1.295,-29.132 3.696,-59.031 17.518,-84.923 16.821,-30.619 39.378,-57.783 64.526,-81.9 31.387,-32.634 67.501,-60.374 97.857,-94.041 27.332,-28.988 51.256,-61.479 68.005,-97.785 20.541,-41.13 26.972,-87.827 25.82,-133.372 -0.912,-32.107 -5.231,-64.406 -16.149,-94.737 -11.59,-31.699 -31.123,-61.047 -58.335,-81.371 -25.124,-19.125 -55.696,-29.852 -86.651,-34.771 -49.552,-6.743 -101.888,-4.847 -148.465,14.854 -35.227,14.829 -64.238,42.689 -81.708,76.548 -20.996,40.242 -27.115,86.339 -27.259,131.212 0.048,17.829 0,35.658 0.048,53.463 44.345,0.048 88.69,-0.023 133.059,0.048 1.728,-35.538 -4.055,-72.06 5.663,-106.807 5.783,-22.173 26.204,-37.794 48.185,-41.754 20.733,-3.431 43.577,-2.015 61.622,9.791 15.502,9.43 23.949,26.78 26.78,44.225 5.903,35.922 1.872,74.293 -15.381,106.688 -16.918,30.595 -39.474,57.711 -64.55,81.899 -33.187,34.099 -71.173,63.254 -102.585,99.081 -26.756,28.867 -49.408,61.646 -65.486,97.641 -24.572,52.48 -26.731,112.422 -20.18,169.102 C -49.456,-77.604 -33.019,-32.155 0,0"
-   style="fill:#feeeee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-   id="path34" />
 					</g>
-                    <g
+                    <g id="g36" transform="translate(1262.7214,1613.126)">
-   id="g36"
+						<path d="m 0,0 v -301.13 c 23.204,0.024 46.409,-0.048 69.613,0.024 18.525,0.288 38.202,6.575 50.153,21.429 12.43,17.277 13.917,39.522 14.613,60.111 0.024,43.985 -0.048,87.994 0.024,131.979 -0.48,23.637 -0.983,50.369 -17.277,69.23 C 104.864,-5.711 86.867,-0.24 69.589,0 46.385,0.048 23.204,0.024 0,0 m -141.002,128.38 c 26.708,0.048 53.392,0 80.075,0.024 H 55.24 c 35.346,-0.12 71.389,-2.471 104.815,-14.925 30.668,-10.823 57.592,-31.148 76.621,-57.496 26.852,-39.09 36.69,-87.202 38.058,-133.947 0.024,-48.833 0.096,-97.689 -0.024,-146.521 -1.728,-47.993 -11.974,-97.953 -41.514,-136.971 -22.748,-30.644 -57.495,-50.801 -94.281,-59.583 -45.377,-11.878 -92.578,-6.791 -138.891,-7.847 -0.072,-111.799 0,-223.574 -0.024,-335.373 -13.942,0 -27.86,0.024 -41.778,-0.024 -32.802,0.072 -65.605,0 -98.384,0.048 l -0.744,0.984 c -0.216,26.444 0,52.888 -0.096,79.332 0.024,244.211 0.048,488.421 0,732.632 0.048,26.563 0.024,53.103 0,79.667" style="fill:#feeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path38" />
-   transform="translate(1262.7214,1613.126)">
-						<path
-   d="m 0,0 v -301.13 c 23.204,0.024 46.409,-0.048 69.613,0.024 18.525,0.288 38.202,6.575 50.153,21.429 12.43,17.277 13.917,39.522 14.613,60.111 0.024,43.985 -0.048,87.994 0.024,131.979 -0.48,23.637 -0.983,50.369 -17.277,69.23 C 104.864,-5.711 86.867,-0.24 69.589,0 46.385,0.048 23.204,0.024 0,0 m -141.002,128.38 c 26.708,0.048 53.392,0 80.075,0.024 H 55.24 c 35.346,-0.12 71.389,-2.471 104.815,-14.925 30.668,-10.823 57.592,-31.148 76.621,-57.496 26.852,-39.09 36.69,-87.202 38.058,-133.947 0.024,-48.833 0.096,-97.689 -0.024,-146.521 -1.728,-47.993 -11.974,-97.953 -41.514,-136.971 -22.748,-30.644 -57.495,-50.801 -94.281,-59.583 -45.377,-11.878 -92.578,-6.791 -138.891,-7.847 -0.072,-111.799 0,-223.574 -0.024,-335.373 -13.942,0 -27.86,0.024 -41.778,-0.024 -32.802,0.072 -65.605,0 -98.384,0.048 l -0.744,0.984 c -0.216,26.444 0,52.888 -0.096,79.332 0.024,244.211 0.048,488.421 0,732.632 0.048,26.563 0.024,53.103 0,79.667"
-   style="fill:#feeeee;fill-opacity:1;fill-rule:nonzero;stroke:none"
-   id="path38" />
 					</g>
-                    <g
+                    <g id="g40" transform="translate(1966.3174,1675.6364)">
-   id="g40"
+						<path d="m 0,0 c 7.031,-0.552 11.206,-6.839 15.885,-11.326 25.029,-26.9 52.768,-51.208 76.693,-79.164 27.667,-27.5 54.903,-55.456 82.571,-82.979 13.246,-13.942 27.764,-26.66 39.93,-41.658 18.813,-19.653 38.49,-38.514 57.519,-57.999 23.9,-24.812 49.337,-48.185 71.965,-74.197 36.427,-36.378 72.589,-73.02 108.943,-109.471 18.358,-21.524 39.234,-40.722 58.959,-60.974 22.605,-22.941 45.473,-45.665 68.03,-68.678 10.774,-13.294 23.78,-24.524 34.914,-37.506 -103.904,-41.97 -203.488,-94.114 -298.922,-152.761 -246.994,-152.28 -466.224,-350.298 -639.333,-583.398 -25.197,25.196 -50.297,50.488 -75.325,75.852 -13.51,12.886 -24.908,27.788 -38.634,40.458 -30.667,31.627 -63.014,61.695 -92.17,94.738 -29.347,29.107 -58.359,58.623 -87.514,87.922 -18.717,21.933 -40.05,41.37 -59.967,62.151 -18.909,19.461 -39.042,37.77 -56.607,58.503 -14.998,15.477 -30.452,30.499 -45.569,45.88 -21.717,22.629 -45.017,43.722 -65.126,67.862 32.779,-0.048 65.582,0.024 98.384,-0.048 114.391,-98.097 220.407,-205.984 315.384,-322.99 92.914,114.318 196.242,220.022 307.753,316.271 30.955,4.919 61.526,15.646 86.65,34.771 27.212,20.325 46.745,49.672 58.335,81.371 107.312,77.988 219.327,149.929 337.509,210.376 -35.299,64.67 -75.829,126.437 -118.254,186.643 C 176.253,-228.037 104.24,-140.115 26.42,-57.687 20.181,-37.41 11.878,-17.661 0,0" style="fill:#042338;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path42" />
-   transform="translate(1966.3174,1675.6364)">
-						<path
-   d="m 0,0 c 7.031,-0.552 11.206,-6.839 15.885,-11.326 25.029,-26.9 52.768,-51.208 76.693,-79.164 27.667,-27.5 54.903,-55.456 82.571,-82.979 13.246,-13.942 27.764,-26.66 39.93,-41.658 18.813,-19.653 38.49,-38.514 57.519,-57.999 23.9,-24.812 49.337,-48.185 71.965,-74.197 36.427,-36.378 72.589,-73.02 108.943,-109.471 18.358,-21.524 39.234,-40.722 58.959,-60.974 22.605,-22.941 45.473,-45.665 68.03,-68.678 10.774,-13.294 23.78,-24.524 34.914,-37.506 -103.904,-41.97 -203.488,-94.114 -298.922,-152.761 -246.994,-152.28 -466.224,-350.298 -639.333,-583.398 -25.197,25.196 -50.297,50.488 -75.325,75.852 -13.51,12.886 -24.908,27.788 -38.634,40.458 -30.667,31.627 -63.014,61.695 -92.17,94.738 -29.347,29.107 -58.359,58.623 -87.514,87.922 -18.717,21.933 -40.05,41.37 -59.967,62.151 -18.909,19.461 -39.042,37.77 -56.607,58.503 -14.998,15.477 -30.452,30.499 -45.569,45.88 -21.717,22.629 -45.017,43.722 -65.126,67.862 32.779,-0.048 65.582,0.024 98.384,-0.048 114.391,-98.097 220.407,-205.984 315.384,-322.99 92.914,114.318 196.242,220.022 307.753,316.271 30.955,4.919 61.526,15.646 86.65,34.771 27.212,20.325 46.745,49.672 58.335,81.371 107.312,77.988 219.327,149.929 337.509,210.376 -35.299,64.67 -75.829,126.437 -118.254,186.643 C 176.253,-228.037 104.24,-140.115 26.42,-57.687 20.181,-37.41 11.878,-17.661 0,0"
-   style="fill:#042338;fill-opacity:1;fill-rule:nonzero;stroke:none"
-   id="path42" />
 					</g>
-                    <g
+                    <g id="g44" transform="translate(1499.3971,1669.1094)">
-   id="g44"
+						<path d="m 0,0 c 3.551,-2.088 7.415,-3.935 10.39,-6.911 27.932,-28.1 55.912,-56.175 84.036,-84.083 -6.551,-56.679 -4.392,-116.622 20.18,-169.102 16.078,-35.994 38.73,-68.774 65.486,-97.641 31.412,-35.826 69.398,-64.982 102.585,-99.081 25.076,-24.188 47.632,-51.304 64.55,-81.899 17.253,-32.395 21.284,-70.765 15.381,-106.688 -2.831,-17.445 -11.278,-34.794 -26.78,-44.225 -18.045,-11.806 -40.889,-13.222 -61.622,-9.79 -21.981,3.959 -42.402,19.58 -48.185,41.753 -9.718,34.747 -3.935,71.269 -5.663,106.808 -44.369,-0.072 -88.714,0 -133.059,-0.048 -0.048,-17.806 0,-35.635 -0.048,-53.464 0.144,-44.873 6.263,-90.97 27.259,-131.212 17.47,-33.859 46.481,-61.718 81.708,-76.548 46.577,-19.701 98.913,-21.597 148.465,-14.854 -111.511,-96.249 -214.839,-201.953 -307.753,-316.271 -94.977,117.006 -200.993,224.893 -315.383,322.99 13.918,0.048 27.836,0.024 41.777,0.024 0.024,111.799 -0.048,223.574 0.024,335.372 46.313,1.056 93.514,-4.031 138.891,7.847 36.786,8.783 71.533,28.94 94.282,59.583 29.539,39.018 39.785,88.978 41.513,136.971 0.12,48.833 0.048,97.689 0.024,146.522 C 36.69,-87.203 26.852,-39.09 0,0" style="fill:#1c72ba;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path46" />
-   transform="translate(1499.3971,1669.1094)">
-						<path
-   d="m 0,0 c 3.551,-2.088 7.415,-3.935 10.39,-6.911 27.932,-28.1 55.912,-56.175 84.036,-84.083 -6.551,-56.679 -4.392,-116.622 20.18,-169.102 16.078,-35.994 38.73,-68.774 65.486,-97.641 31.412,-35.826 69.398,-64.982 102.585,-99.081 25.076,-24.188 47.632,-51.304 64.55,-81.899 17.253,-32.395 21.284,-70.765 15.381,-106.688 -2.831,-17.445 -11.278,-34.794 -26.78,-44.225 -18.045,-11.806 -40.889,-13.222 -61.622,-9.79 -21.981,3.959 -42.402,19.58 -48.185,41.753 -9.718,34.747 -3.935,71.269 -5.663,106.808 -44.369,-0.072 -88.714,0 -133.059,-0.048 -0.048,-17.806 0,-35.635 -0.048,-53.464 0.144,-44.873 6.263,-90.97 27.259,-131.212 17.47,-33.859 46.481,-61.718 81.708,-76.548 46.577,-19.701 98.913,-21.597 148.465,-14.854 -111.511,-96.249 -214.839,-201.953 -307.753,-316.271 -94.977,117.006 -200.993,224.893 -315.383,322.99 13.918,0.048 27.836,0.024 41.777,0.024 0.024,111.799 -0.048,223.574 0.024,335.372 46.313,1.056 93.514,-4.031 138.891,7.847 36.786,8.783 71.533,28.94 94.282,59.583 29.539,39.018 39.785,88.978 41.513,136.971 0.12,48.833 0.048,97.689 0.024,146.522 C 36.69,-87.203 26.852,-39.09 0,0"
-   style="fill:#1c72ba;fill-opacity:1;fill-rule:nonzero;stroke:none"
-   id="path46" />
 					</g>
-                    <g
+                    <g id="g48" transform="translate(1748.0469,1601.6797)">
-   id="g48"
+						<path d="M 0,0 C 14.11,17.277 37.722,23.036 59.175,21.597 80.82,20.709 103.4,9.791 112.927,-10.534 c 13.438,-28.94 9.142,-61.719 10.174,-92.626 44.345,0.12 88.691,0 133.036,0.072 0.504,40.002 -0.576,80.556 -11.447,119.358 77.82,-82.428 149.833,-170.35 215.583,-262.664 42.426,-60.207 82.956,-121.973 118.254,-186.643 -118.182,-60.447 -230.196,-132.388 -337.508,-210.376 10.918,30.331 15.238,62.63 16.149,94.737 1.152,45.545 -5.279,92.242 -25.82,133.372 -16.749,36.306 -40.673,68.797 -68.005,97.785 -30.355,33.667 -66.47,61.406 -97.857,94.041 -25.148,24.117 -47.705,51.28 -64.526,81.9 -13.822,25.892 -18.813,55.791 -17.517,84.923 C -15.382,-37.002 -12.79,-15.862 0,0" style="fill:#1c72ba;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path50" />
-   transform="translate(1748.0469,1601.6797)">
-						<path
-   d="M 0,0 C 14.11,17.277 37.722,23.036 59.175,21.597 80.82,20.709 103.4,9.791 112.927,-10.534 c 13.438,-28.94 9.142,-61.719 10.174,-92.626 44.345,0.12 88.691,0 133.036,0.072 0.504,40.002 -0.576,80.556 -11.447,119.358 77.82,-82.428 149.833,-170.35 215.583,-262.664 42.426,-60.207 82.956,-121.973 118.254,-186.643 -118.182,-60.447 -230.196,-132.388 -337.508,-210.376 10.918,30.331 15.238,62.63 16.149,94.737 1.152,45.545 -5.279,92.242 -25.82,133.372 -16.749,36.306 -40.673,68.797 -68.005,97.785 -30.355,33.667 -66.47,61.406 -97.857,94.041 -25.148,24.117 -47.705,51.28 -64.526,81.9 -13.822,25.892 -18.813,55.791 -17.517,84.923 C -15.382,-37.002 -12.79,-15.862 0,0"
-   style="fill:#1c72ba;fill-opacity:1;fill-rule:nonzero;stroke:none"
-   id="path50" />
 					</g>
-                    <g
+                    <g id="g52" transform="translate(1262.7214,1613.126)">
-   id="g52"
+						<path d="m 0,0 c 23.204,0.024 46.385,0.048 69.589,0 17.278,-0.24 35.275,-5.711 47.537,-18.357 16.294,-18.861 16.797,-45.593 17.277,-69.23 -0.072,-43.985 0,-87.994 -0.024,-131.979 -0.696,-20.589 -2.183,-42.834 -14.613,-60.111 -11.951,-14.854 -31.628,-21.141 -50.153,-21.429 -23.204,-0.072 -46.409,0 -69.613,-0.024 z" style="fill:#1c72ba;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path54" />
-   transform="translate(1262.7214,1613.126)">
-						<path
-   d="m 0,0 c 23.204,0.024 46.385,0.048 69.589,0 17.278,-0.24 35.275,-5.711 47.537,-18.357 16.294,-18.861 16.797,-45.593 17.277,-69.23 -0.072,-43.985 0,-87.994 -0.024,-131.979 -0.696,-20.589 -2.183,-42.834 -14.613,-60.111 -11.951,-14.854 -31.628,-21.141 -50.153,-21.429 -23.204,-0.072 -46.409,0 -69.613,-0.024 z"
-   style="fill:#1c72ba;fill-opacity:1;fill-rule:nonzero;stroke:none"
-   id="path54" />
 					</g>
 				</g>
 			</g>

Bukkit/build.gradle.kts

@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    api(projects.plotsquaredCore)
+    api(projects.plotSquaredCore)
 
     // Metrics
     implementation("org.bstats:bstats-bukkit")
@@ -62,7 +62,6 @@ tasks.processResources {
 }
 
 tasks.named<ShadowJar>("shadowJar") {
-    dependsOn(":plotsquared-core:shadowJar")
     dependencies {
         exclude(dependency("org.checkerframework:"))
     }
@@ -103,7 +102,7 @@ tasks {
         opt.links("https://jd.papermc.io/paper/1.19/")
         opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
         opt.links("https://intellectualsites.github.io/plotsquared-javadocs/core/")
-        opt.links("https://jd.advntr.dev/api/4.14.0/")
+        opt.links("https://jd.adventure.kyori.net/api/4.12.0/")
         opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
         opt.links("https://checkerframework.org/api/")
         opt.isLinkSource = true

Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java

@@ -50,6 +50,7 @@ import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.bukkit.util.BukkitWorld;
 import com.plotsquared.bukkit.util.SetGenCB;
 import com.plotsquared.bukkit.util.TranslationUpdateManager;
+import com.plotsquared.bukkit.util.UpdateUtility;
 import com.plotsquared.bukkit.util.task.BukkitTaskManager;
 import com.plotsquared.bukkit.util.task.PaperTimeConverter;
 import com.plotsquared.bukkit.util.task.SpigotTimeConverter;
@@ -71,8 +72,6 @@ import com.plotsquared.core.configuration.Storage;
 import com.plotsquared.core.configuration.caption.ChatFormatter;
 import com.plotsquared.core.configuration.file.YamlConfiguration;
 import com.plotsquared.core.database.DBFunc;
-import com.plotsquared.core.events.RemoveRoadEntityEvent;
-import com.plotsquared.core.events.Result;
 import com.plotsquared.core.generator.GeneratorWrapper;
 import com.plotsquared.core.generator.IndependentPlotGenerator;
 import com.plotsquared.core.generator.SingleWorldGenerator;
@@ -111,7 +110,6 @@ import com.plotsquared.core.uuid.CacheUUIDService;
 import com.plotsquared.core.uuid.UUIDPipeline;
 import com.plotsquared.core.uuid.offline.OfflineModeUUIDService;
 import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import io.papermc.lib.PaperLib;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
@@ -295,18 +293,17 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
         this.injector.injectMembers(this);
 
         try {
-            this.injector.getInstance(TranslationUpdateManager.class).upgradeTranslationFile();
+            this.injector.getInstance(TranslationUpdateManager.class);
+            TranslationUpdateManager.upgradeTranslationFile();
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
 
         this.serverLocale = Locale.forLanguageTag(Settings.Enabled_Components.DEFAULT_LOCALE);
 
-        /* TODO Enable update checker before v7 is released to GA
         if (PremiumVerification.isPremium() && Settings.Enabled_Components.UPDATE_NOTIFICATIONS) {
             injector.getInstance(UpdateUtility.class).updateChecker();
         }
-         */
 
         if (PremiumVerification.isPremium()) {
             LOGGER.info("PlotSquared version licensed to Spigot user {}", getUserID());
@@ -822,7 +819,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                         if (entity.hasMetadata("ps-tmp-teleport")) {
                                             continue;
                                         }
-                                        this.removeRoadEntity(entity, iterator);
+                                        iterator.remove();
+                                        entity.remove();
                                     }
                                     continue;
                                 }
@@ -835,7 +833,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                     if (entity.hasMetadata("ps-tmp-teleport")) {
                                         continue;
                                     }
-                                    this.removeRoadEntity(entity, iterator);
+                                    iterator.remove();
+                                    entity.remove();
                                 }
                             }
                             continue;
@@ -845,7 +844,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                         case "DROPPED_ITEM":
                             if (Settings.Enabled_Components.KILL_ROAD_ITEMS
                                     && plotArea.getOwnedPlotAbs(BukkitUtil.adapt(entity.getLocation())) == null) {
-                                this.removeRoadEntity(entity, iterator);
+                                entity.remove();
                             }
                             // dropped item
                             continue;
@@ -876,7 +875,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                                 if (entity.hasMetadata("ps-tmp-teleport")) {
                                                     continue;
                                                 }
-                                                this.removeRoadEntity(entity, iterator);
+                                                iterator.remove();
+                                                entity.remove();
                                             }
                                         }
                                     }
@@ -981,7 +981,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                                 if (entity.hasMetadata("ps-tmp-teleport")) {
                                                     continue;
                                                 }
-                                                this.removeRoadEntity(entity, iterator);
+                                                iterator.remove();
+                                                entity.remove();
                                             }
                                         }
                                     } else {
@@ -992,7 +993,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                             if (entity.hasMetadata("ps-tmp-teleport")) {
                                                 continue;
                                             }
-                                            this.removeRoadEntity(entity, iterator);
+                                            iterator.remove();
+                                            entity.remove();
                                         }
                                     }
                                 }
@@ -1006,20 +1008,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
         }), TaskTime.seconds(1L));
     }
 
-    private void removeRoadEntity(Entity entity, Iterator<Entity> entityIterator) {
-        RemoveRoadEntityEvent event = eventDispatcher.callRemoveRoadEntity(BukkitAdapter.adapt(entity));
-
-        if (event.getEventResult() == Result.DENY) {
-            return;
-        }
-
-        entityIterator.remove();
-        entity.remove();
-    }
-
     @Override
-    public @Nullable
+    public @Nullable ChunkGenerator getDefaultWorldGenerator(
-    final ChunkGenerator getDefaultWorldGenerator(
             final @NonNull String worldName,
             final @Nullable String id
     ) {

Bukkit/src/main/java/com/plotsquared/bukkit/entity/HorseStats.java

@@ -18,14 +18,9 @@
  */
 package com.plotsquared.bukkit.entity;
 
-import org.bukkit.entity.Horse;
-
 class HorseStats {
 
     double jump;
     boolean chest;
-    Horse.Variant variant;
-    Horse.Color color;
-    Horse.Style style;
 
 }

Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java

@@ -101,26 +101,50 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             this.noGravity = true;
         }
         switch (entity.getType().toString()) {
-            case "BOAT" -> {
+            case "BOAT":
                 Boat boat = (Boat) entity;
                 this.dataByte = getOrdinal(TreeSpecies.values(), boat.getWoodType());
                 return;
-            }
+            case "ARROW":
-            case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "EXPERIENCE_ORB", "FALLING_BLOCK", "FIREBALL",
+            case "EGG":
-                    "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND", "MINECART_MOB_SPAWNER",
+            case "ENDER_CRYSTAL":
-                    "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SLIME", "SMALL_FIREBALL", "SNOWBALL", "MINECART_FURNACE", "SPLASH_POTION",
+            case "ENDER_PEARL":
-                    "THROWN_EXP_BOTTLE", "WITHER_SKULL", "UNKNOWN", "SPECTRAL_ARROW", "SHULKER_BULLET", "DRAGON_FIREBALL", "AREA_EFFECT_CLOUD",
+            case "ENDER_SIGNAL":
-                    "TRIDENT", "LLAMA_SPIT" -> {
+            case "EXPERIENCE_ORB":
+            case "FALLING_BLOCK":
+            case "FIREBALL":
+            case "FIREWORK":
+            case "FISHING_HOOK":
+            case "LEASH_HITCH":
+            case "LIGHTNING":
+            case "MINECART":
+            case "MINECART_COMMAND":
+            case "MINECART_MOB_SPAWNER":
+            case "MINECART_TNT":
+            case "PLAYER":
+            case "PRIMED_TNT":
+            case "SLIME":
+            case "SMALL_FIREBALL":
+            case "SNOWBALL":
+            case "MINECART_FURNACE":
+            case "SPLASH_POTION":
+            case "THROWN_EXP_BOTTLE":
+            case "WITHER_SKULL":
+            case "UNKNOWN":
+            case "SPECTRAL_ARROW":
+            case "SHULKER_BULLET":
+            case "DRAGON_FIREBALL":
+            case "AREA_EFFECT_CLOUD":
+            case "TRIDENT":
+            case "LLAMA_SPIT":
                 // Do this stuff later
                 return;
-            }
             // MISC //
-            case "DROPPED_ITEM" -> {
+            case "DROPPED_ITEM":
                 Item item = (Item) entity;
                 this.stack = item.getItemStack();
                 return;
-            }
+            case "ITEM_FRAME":
-            case "ITEM_FRAME" -> {
                 this.x = Math.floor(this.getX());
                 this.y = Math.floor(this.getY());
                 this.z = Math.floor(this.getZ());
@@ -128,8 +152,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 this.dataByte = getOrdinal(Rotation.values(), itemFrame.getRotation());
                 this.stack = itemFrame.getItem().clone();
                 return;
-            }
+            case "PAINTING":
-            case "PAINTING" -> {
                 this.x = Math.floor(this.getX());
                 this.y = Math.floor(this.getY());
                 this.z = Math.floor(this.getZ());
@@ -142,43 +165,41 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 }
                 this.dataString = art.name();
                 return;
-            }
             // END MISC //
             // INVENTORY HOLDER //
-            case "MINECART_CHEST", "MINECART_HOPPER" -> {
+            case "MINECART_CHEST":
+            case "MINECART_HOPPER":
                 storeInventory((InventoryHolder) entity);
                 return;
-            }
             // START LIVING ENTITY //
             // START AGEABLE //
             // START TAMEABLE //
-            case "HORSE", "DONKEY", "LLAMA", "MULE", "SKELETON_HORSE" -> {
+            case "HORSE":
+            case "DONKEY":
+            case "LLAMA":
+            case "MULE":
+            case "SKELETON_HORSE":
                 AbstractHorse horse = (AbstractHorse) entity;
                 this.horse = new HorseStats();
                 this.horse.jump = horse.getJumpStrength();
                 if (horse instanceof ChestedHorse horse1) {
                     this.horse.chest = horse1.isCarryingChest();
                 }
-                //todo these horse features need fixing
-                //this.horse.variant = horse.getVariant();
-                //this.horse.style = horse.getStyle();
-                //this.horse.color = horse.getColor();
                 storeTameable(horse);
                 storeAgeable(horse);
                 storeLiving(horse);
                 storeInventory(horse);
                 return;
-            }
             // END INVENTORY HOLDER //
-            case "WOLF", "OCELOT" -> {
+            case "WOLF":
+            case "OCELOT":
                 storeTameable((Tameable) entity);
                 storeAgeable((Ageable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
-            }
             // END TAMEABLE //
             //todo fix sheep
-            case "SHEEP" -> {
+            case "SHEEP":
                 Sheep sheep = (Sheep) entity;
                 if (sheep.isSheared()) {
                     this.dataByte = (byte) 1;
@@ -189,20 +210,23 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 storeAgeable(sheep);
                 storeLiving(sheep);
                 return;
-            }
+            case "VILLAGER":
-            case "VILLAGER", "CHICKEN", "COW", "MUSHROOM_COW", "PIG", "TURTLE", "POLAR_BEAR" -> {
+            case "CHICKEN":
+            case "COW":
+            case "MUSHROOM_COW":
+            case "PIG":
+            case "TURTLE":
+            case "POLAR_BEAR":
                 storeAgeable((Ageable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
-            }
+            case "RABBIT":
-            case "RABBIT" -> {
                 this.dataByte = getOrdinal(Rabbit.Type.values(), ((Rabbit) entity).getRabbitType());
                 storeAgeable((Ageable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
-            }
             // END AGEABLE //
-            case "ARMOR_STAND" -> {
+            case "ARMOR_STAND":
                 ArmorStand stand = (ArmorStand) entity;
                 this.inventory =
                         new ItemStack[]{stand.getItemInHand().clone(), stand.getHelmet().clone(),
@@ -210,30 +234,37 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                                 stand.getBoots().clone()};
                 storeLiving(stand);
                 this.stand = new ArmorStandStats();
+
                 EulerAngle head = stand.getHeadPose();
                 this.stand.head[0] = (float) head.getX();
                 this.stand.head[1] = (float) head.getY();
                 this.stand.head[2] = (float) head.getZ();
+
                 EulerAngle body = stand.getBodyPose();
                 this.stand.body[0] = (float) body.getX();
                 this.stand.body[1] = (float) body.getY();
                 this.stand.body[2] = (float) body.getZ();
+
                 EulerAngle leftLeg = stand.getLeftLegPose();
                 this.stand.leftLeg[0] = (float) leftLeg.getX();
                 this.stand.leftLeg[1] = (float) leftLeg.getY();
                 this.stand.leftLeg[2] = (float) leftLeg.getZ();
+
                 EulerAngle rightLeg = stand.getRightLegPose();
                 this.stand.rightLeg[0] = (float) rightLeg.getX();
                 this.stand.rightLeg[1] = (float) rightLeg.getY();
                 this.stand.rightLeg[2] = (float) rightLeg.getZ();
+
                 EulerAngle leftArm = stand.getLeftArmPose();
                 this.stand.leftArm[0] = (float) leftArm.getX();
                 this.stand.leftArm[1] = (float) leftArm.getY();
                 this.stand.leftArm[2] = (float) leftArm.getZ();
+
                 EulerAngle rightArm = stand.getRightArmPose();
                 this.stand.rightArm[0] = (float) rightArm.getX();
                 this.stand.rightArm[1] = (float) rightArm.getY();
                 this.stand.rightArm[2] = (float) rightArm.getZ();
+
                 if (stand.hasArms()) {
                     this.stand.arms = true;
                 }
@@ -247,38 +278,53 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                     this.stand.small = true;
                 }
                 return;
-            }
+            case "ENDERMITE":
-            case "ENDERMITE" -> {
                 return;
-            }
+            case "BAT":
-            case "BAT" -> {
                 if (((Bat) entity).isAwake()) {
                     this.dataByte = (byte) 1;
                 } else {
                     this.dataByte = (byte) 0;
                 }
                 return;
-            }
+            case "ENDER_DRAGON":
-            case "ENDER_DRAGON" -> {
                 EnderDragon entity1 = (EnderDragon) entity;
                 this.dataByte = (byte) entity1.getPhase().ordinal();
                 return;
-            }
+            case "SKELETON":
-            case "SKELETON", "WITHER_SKELETON", "GUARDIAN", "ELDER_GUARDIAN", "GHAST", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN",
+            case "WITHER_SKELETON":
-                    "ZOMBIFIED_PIGLIN", "PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH",
+            case "GUARDIAN":
-                    "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SHULKER", "SNOWMAN" -> {
+            case "ELDER_GUARDIAN":
+            case "GHAST":
+            case "MAGMA_CUBE":
+            case "SQUID":
+            case "PIG_ZOMBIE":
+            case "HOGLIN":
+            case "ZOMBIFIED_PIGLIN":
+            case "PIGLIN":
+            case "PIGLIN_BRUTE":
+            case "ZOMBIE":
+            case "WITHER":
+            case "WITCH":
+            case "SPIDER":
+            case "CAVE_SPIDER":
+            case "SILVERFISH":
+            case "GIANT":
+            case "ENDERMAN":
+            case "CREEPER":
+            case "BLAZE":
+            case "SHULKER":
+            case "SNOWMAN":
                 storeLiving((LivingEntity) entity);
                 return;
-            }
+            case "IRON_GOLEM":
-            case "IRON_GOLEM" -> {
                 if (((IronGolem) entity).isPlayerCreated()) {
                     this.dataByte = (byte) 1;
                 } else {
                     this.dataByte = (byte) 0;
                 }
                 storeLiving((LivingEntity) entity);
-            }
+                // END LIVING //
-            // END LIVING //
         }
     }
 
@@ -415,15 +461,20 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
         }
         Entity entity;
         switch (this.getType().toString()) {
-            case "DROPPED_ITEM" -> {
+            case "DROPPED_ITEM":
                 return world.dropItem(location, this.stack);
-            }
+            case "PLAYER":
-            case "PLAYER", "LEASH_HITCH" -> {
+            case "LEASH_HITCH":
                 return null;
-            }
+            case "ITEM_FRAME":
-            case "ITEM_FRAME" -> entity = world.spawn(location, ItemFrame.class);
+                entity = world.spawn(location, ItemFrame.class);
-            case "PAINTING" -> entity = world.spawn(location, Painting.class);
+                break;
-            default -> entity = world.spawnEntity(location, this.getType());
+            case "PAINTING":
+                entity = world.spawn(location, Painting.class);
+                break;
+            default:
+                entity = world.spawnEntity(location, this.getType());
+                break;
         }
         if (this.depth == 0) {
             return entity;
@@ -451,70 +502,91 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             entity.setGravity(false);
         }
         switch (entity.getType().toString()) {
-            case "BOAT" -> {
+            case "BOAT":
                 Boat boat = (Boat) entity;
                 boat.setWoodType(TreeSpecies.values()[dataByte]);
                 return entity;
-            }
+            case "SLIME":
-            case "SLIME" -> {
                 ((Slime) entity).setSize(this.dataByte);
                 return entity;
-            }
+            case "ARROW":
-            case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "DROPPED_ITEM", "EXPERIENCE_ORB", "FALLING_BLOCK",
+            case "EGG":
-                    "FIREBALL", "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND",
+            case "ENDER_CRYSTAL":
-                    "MINECART_MOB_SPAWNER", "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SMALL_FIREBALL", "SNOWBALL",
+            case "ENDER_PEARL":
-                    "SPLASH_POTION", "THROWN_EXP_BOTTLE", "SPECTRAL_ARROW", "SHULKER_BULLET", "AREA_EFFECT_CLOUD",
+            case "ENDER_SIGNAL":
-                    "DRAGON_FIREBALL", "WITHER_SKULL", "MINECART_FURNACE", "LLAMA_SPIT", "TRIDENT", "UNKNOWN" -> {
+            case "DROPPED_ITEM":
+            case "EXPERIENCE_ORB":
+            case "FALLING_BLOCK":
+            case "FIREBALL":
+            case "FIREWORK":
+            case "FISHING_HOOK":
+            case "LEASH_HITCH":
+            case "LIGHTNING":
+            case "MINECART":
+            case "MINECART_COMMAND":
+            case "MINECART_MOB_SPAWNER":
+            case "MINECART_TNT":
+            case "PLAYER":
+            case "PRIMED_TNT":
+            case "SMALL_FIREBALL":
+            case "SNOWBALL":
+            case "SPLASH_POTION":
+            case "THROWN_EXP_BOTTLE":
+            case "SPECTRAL_ARROW":
+            case "SHULKER_BULLET":
+            case "AREA_EFFECT_CLOUD":
+            case "DRAGON_FIREBALL":
+            case "WITHER_SKULL":
+            case "MINECART_FURNACE":
+            case "LLAMA_SPIT":
+            case "TRIDENT":
+            case "UNKNOWN":
                 // Do this stuff later
                 return entity;
-            }
             // MISC //
-            case "ITEM_FRAME" -> {
+            case "ITEM_FRAME":
                 ItemFrame itemframe = (ItemFrame) entity;
                 itemframe.setRotation(Rotation.values()[this.dataByte]);
                 itemframe.setItem(this.stack);
                 return entity;
-            }
+            case "PAINTING":
-            case "PAINTING" -> {
                 Painting painting = (Painting) entity;
                 painting.setFacingDirection(BlockFace.values()[this.dataByte], true);
                 painting.setArt(Art.getByName(this.dataString), true);
                 return entity;
-            }
             // END MISC //
             // INVENTORY HOLDER //
-            case "MINECART_CHEST", "MINECART_HOPPER" -> {
+            case "MINECART_CHEST":
+            case "MINECART_HOPPER":
                 restoreInventory((InventoryHolder) entity);
                 return entity;
-            }
             // START LIVING ENTITY //
             // START AGEABLE //
             // START TAMEABLE //
-            case "HORSE", "LLAMA", "SKELETON_HORSE", "DONKEY", "MULE" -> {
+            case "HORSE":
+            case "LLAMA":
+            case "SKELETON_HORSE":
+            case "DONKEY":
+            case "MULE":
                 AbstractHorse horse = (AbstractHorse) entity;
                 horse.setJumpStrength(this.horse.jump);
                 if (horse instanceof ChestedHorse) {
                     ((ChestedHorse) horse).setCarryingChest(this.horse.chest);
                 }
-                //todo broken as of 1.13
-                //horse.setVariant(this.horse.variant);
-                //horse.setStyle(this.horse.style);
-                //horse.setColor(this.horse.color);
                 restoreTameable(horse);
                 restoreAgeable(horse);
                 restoreLiving(horse);
                 restoreInventory(horse);
                 return entity;
-            }
             // END INVENTORY HOLDER //
-            case "WOLF", "OCELOT" -> {
+            case "WOLF":
+            case "OCELOT":
                 restoreTameable((Tameable) entity);
                 restoreAgeable((Ageable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
             // END AGEABLE //
-            case "SHEEP" -> {
+            case "SHEEP":
                 Sheep sheep = (Sheep) entity;
                 if (this.dataByte == 1) {
                     sheep.setSheared(true);
@@ -525,22 +597,25 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 restoreAgeable(sheep);
                 restoreLiving(sheep);
                 return sheep;
-            }
+            case "VILLAGER":
-            case "VILLAGER", "CHICKEN", "COW", "TURTLE", "POLAR_BEAR", "MUSHROOM_COW", "PIG" -> {
+            case "CHICKEN":
+            case "COW":
+            case "TURTLE":
+            case "POLAR_BEAR":
+            case "MUSHROOM_COW":
+            case "PIG":
                 restoreAgeable((Ageable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
             // END AGEABLE //
-            case "RABBIT" -> {
+            case "RABBIT":
                 if (this.dataByte != 0) {
                     ((Rabbit) entity).setRabbitType(Rabbit.Type.values()[this.dataByte]);
                 }
                 restoreAgeable((Ageable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
+            case "ARMOR_STAND":
-            case "ARMOR_STAND" -> {
                 // CHECK positions
                 ArmorStand stand = (ArmorStand) entity;
                 if (this.inventory[0] != null) {
@@ -610,38 +685,56 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 }
                 restoreLiving(stand);
                 return stand;
-            }
+            case "BAT":
-            case "BAT" -> {
                 if (this.dataByte != 0) {
                     ((Bat) entity).setAwake(true);
                 }
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
+            case "ENDER_DRAGON":
-            case "ENDER_DRAGON" -> {
                 if (this.dataByte != 0) {
                     ((EnderDragon) entity).setPhase(EnderDragon.Phase.values()[this.dataByte]);
                 }
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
+            case "ENDERMITE":
-            case "ENDERMITE", "GHAST", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN", "PIGLIN", "ZOMBIFIED_PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH", "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SNOWMAN", "SHULKER", "GUARDIAN", "ELDER_GUARDIAN", "SKELETON", "WITHER_SKELETON" -> {
+            case "GHAST":
+            case "MAGMA_CUBE":
+            case "SQUID":
+            case "PIG_ZOMBIE":
+            case "HOGLIN":
+            case "PIGLIN":
+            case "ZOMBIFIED_PIGLIN":
+            case "PIGLIN_BRUTE":
+            case "ZOMBIE":
+            case "WITHER":
+            case "WITCH":
+            case "SPIDER":
+            case "CAVE_SPIDER":
+            case "SILVERFISH":
+            case "GIANT":
+            case "ENDERMAN":
+            case "CREEPER":
+            case "BLAZE":
+            case "SNOWMAN":
+            case "SHULKER":
+            case "GUARDIAN":
+            case "ELDER_GUARDIAN":
+            case "SKELETON":
+            case "WITHER_SKELETON":
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
+            case "IRON_GOLEM":
-            case "IRON_GOLEM" -> {
                 if (this.dataByte != 0) {
                     ((IronGolem) entity).setPlayerCreated(true);
                 }
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            }
+            default:
-            default -> {
                 if (Settings.DEBUG) {
                     LOGGER.info("Could not identify entity: {}", entity.getType());
                 }
                 return entity;
-            }
             // END LIVING
         }
     }

Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java

@@ -24,6 +24,7 @@ import com.plotsquared.core.generator.IndependentPlotGenerator;
 import com.plotsquared.core.location.Location;
 import com.plotsquared.core.location.UncheckedWorldLocation;
 import com.plotsquared.core.plot.PlotArea;
+import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.plot.world.SinglePlotArea;
 import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
 import org.bukkit.generator.BlockPopulator;
@@ -46,6 +47,17 @@ final class BlockStatePopulator extends BlockPopulator {
         this.plotGenerator = plotGenerator;
     }
 
+    /**
+     * @deprecated Use {@link BlockStatePopulator#BlockStatePopulator(IndependentPlotGenerator)} as plotAreManager is unused
+     */
+    @Deprecated(forRemoval = true, since = "6.9.0")
+    public BlockStatePopulator(
+            final @NonNull IndependentPlotGenerator plotGenerator,
+            final @NonNull PlotAreaManager plotAreaManager
+    ) {
+        this.plotGenerator = plotGenerator;
+    }
+
     @Override
     public void populate(
             @NonNull final WorldInfo worldInfo,

Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java

@@ -34,12 +34,9 @@ import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
 import com.plotsquared.core.util.ChunkManager;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.math.BlockVector2;
-import com.sk89q.worldedit.math.BlockVector3;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.bukkit.HeightMap;
-import org.bukkit.NamespacedKey;
-import org.bukkit.Registry;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.generator.BiomeProvider;
@@ -51,14 +48,10 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
 
-import static java.util.function.Predicate.not;
-
 public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrapper<ChunkGenerator> {
 
     private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitPlotGenerator.class.getSimpleName());
@@ -284,14 +277,9 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
         return super.getBaseHeight(worldInfo, random, x, z, heightMap);
     }
 
-    /**
-     * The entire method is deprecated, but kept for compatibility with versions lower than or equal to 1.16.2.
-     * The method will be removed in future versions, because WorldEdit and FastAsyncWorldEdit only support the latest point
-     * release.
-     */
     @SuppressWarnings("deprecation") // The entire method is deprecated, but kept for compatibility with <=1.16.2
     @Override
-    @Deprecated(since = "7.0.0")
+    @Deprecated(since = "TODO")
     public @NonNull ChunkData generateChunkData(
             @NonNull World world, @NonNull Random random, int x, int z, @NonNull BiomeGrid biome
     ) {
@@ -299,8 +287,8 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
             if (this.platformGenerator != this) {
                 return this.platformGenerator.generateChunkData(world, random, x, z, biome);
             } else {
-                // Throw exception to be caught by the server that indicates the new generation API is being used.
+                // Return super as it will throw an exception caught by the server that will mean this method is no longer used.
-                throw new UnsupportedOperationException("Using new generation methods. This method is unsupported.");
+                return super.generateChunkData(world, random, x, z, biome);
             }
         }
 
@@ -421,11 +409,7 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
         if (lastPlotArea != null && name.equals(this.levelName) && chunkX == lastChunkX && chunkZ == lastChunkZ) {
             return lastPlotArea;
         }
-        BlockVector3 loc = BlockVector3.at(chunkX << 4, 0, chunkZ << 4);
+        PlotArea area = UncheckedWorldLocation.at(name, chunkX << 4, 0, chunkZ << 4).getPlotArea();
-        if (lastPlotArea != null && lastPlotArea.getRegion().contains(loc) && lastPlotArea.getRegion().contains(loc)) {
-            return lastPlotArea;
-        }
-        PlotArea area = UncheckedWorldLocation.at(name, loc).getPlotArea();
         if (area == null) {
             throw new IllegalStateException(String.format(
                     "Cannot generate chunk that does not belong to a plot area. World: %s",
@@ -445,16 +429,9 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
         private static final List<Biome> BIOMES;
 
         static {
-            Set<Biome> disabledBiomes = EnumSet.of(Biome.CUSTOM);
+            ArrayList<Biome> biomes = new ArrayList<>(List.of(Biome.values()));
-            if (PlotSquared.platform().serverVersion()[1] <= 19) {
+            biomes.remove(Biome.CUSTOM);
-                final Biome cherryGrove = Registry.BIOME.get(NamespacedKey.minecraft("cherry_grove"));
+            BIOMES = List.copyOf(biomes);
-                if (cherryGrove != null) {
-                    disabledBiomes.add(cherryGrove);
-                }
-            }
-            BIOMES = Arrays.stream(Biome.values())
-                    .filter(not(disabledBiomes::contains))
-                    .toList();
         }
 
         @Override

Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java

@@ -72,7 +72,6 @@ import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.type.Dispenser;
-import org.bukkit.block.data.type.Farmland;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.Player;
@@ -100,7 +99,6 @@ import org.bukkit.event.block.BlockSpreadEvent;
 import org.bukkit.event.block.CauldronLevelChangeEvent;
 import org.bukkit.event.block.EntityBlockFormEvent;
 import org.bukkit.event.block.LeavesDecayEvent;
-import org.bukkit.event.block.MoistureChangeEvent;
 import org.bukkit.event.block.SpongeAbsorbEvent;
 import org.bukkit.event.world.StructureGrowEvent;
 import org.bukkit.projectiles.BlockProjectileSource;
@@ -742,43 +740,6 @@ public class BlockEventListener implements Listener {
         }
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onMoistureChange(MoistureChangeEvent event) {
-        Block block = event.getBlock();
-        Location location = BukkitUtil.adapt(block.getLocation());
-        PlotArea area = location.getPlotArea();
-
-        if (area == null) {
-            return;
-        }
-
-        Plot plot = area.getOwnedPlot(location);
-
-        if (plot == null) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (block.getBlockData() instanceof Farmland farmland && event
-                .getNewState()
-                .getBlockData() instanceof Farmland newFarmland) {
-            int currentMoisture = farmland.getMoisture();
-            int newMoisture = newFarmland.getMoisture();
-
-            // farmland gets moisturizes
-            if (newMoisture > currentMoisture) {
-                return;
-            }
-
-            if (plot.getFlag(SoilDryFlag.class)) {
-                return;
-            }
-
-            plot.debug("Soil could not dry because soil-dry = false");
-            event.setCancelled(true);
-        }
-    }
-
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onChange(BlockFromToEvent event) {
         Block fromBlock = event.getBlock();
@@ -1116,7 +1077,6 @@ public class BlockEventListener implements Listener {
             if (plot != null) {
                 plot.debug("Explosion was cancelled because explosion = false");
             }
-            return;
         }
         event.blockList().removeIf(blox -> !plot.equals(area.getOwnedPlot(BukkitUtil.adapt(blox.getLocation()))));
     }

Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java

@@ -26,7 +26,6 @@ import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag;
 import com.plotsquared.core.plot.flag.implementations.MiscInteractFlag;
-import com.plotsquared.core.plot.flag.implementations.SculkSensorInteractFlag;
 import com.plotsquared.core.util.PlotFlagUtil;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -97,12 +96,12 @@ public class BlockEventListener117 implements Listener {
                 area,
                 MiscInteractFlag.class,
                 true
-        ) || plot != null && (!plot.getFlag(MiscInteractFlag.class) || !plot.getFlag(SculkSensorInteractFlag.class))) {
+        ) || plot != null && !plot.getFlag(
+                MiscInteractFlag.class)) {
             if (plotPlayer != null) {
                 if (plot != null) {
                     if (!plot.isAdded(plotPlayer.getUUID())) {
-                        plot.debug(plotPlayer.getName() + " couldn't trigger sculk sensors because both " +
+                        plot.debug(plotPlayer.getName() + " couldn't trigger sculk sensors because misc-interact = false");
-                                "sculk-sensor-interact and misc-interact = false");
                         event.setCancelled(true);
                     }
                 }
@@ -113,15 +112,13 @@ public class BlockEventListener117 implements Listener {
                 if (plot != null) {
                     if (itemThrower == null && (itemThrower = item.getOwner()) == null) {
                         plot.debug(
-                                "A thrown item couldn't trigger sculk sensors because both sculk-sensor-interact and " +
+                                "A thrown item couldn't trigger sculk sensors because misc-interact = false and the item's owner could not be resolved.");
-                                        "misc-interact = false and the item's owner could not be resolved.");
                         event.setCancelled(true);
                         return;
                     }
                     if (!plot.isAdded(itemThrower)) {
                         if (!plot.isAdded(itemThrower)) {
-                            plot.debug("A thrown item couldn't trigger sculk sensors because both sculk-sensor-interact and " +
+                            plot.debug("A thrown item couldn't trigger sculk sensors because misc-interact = false");
-                                    "misc-interact = false");
                             event.setCancelled(true);
                         }
                     }
@@ -140,6 +137,7 @@ public class BlockEventListener117 implements Listener {
         if (area == null) {
             for (int i = blocks.size() - 1; i >= 0; i--) {
                 Location blockLocation = BukkitUtil.adapt(blocks.get(i).getLocation());
+                blockLocation = BukkitUtil.adapt(blocks.get(i).getLocation());
                 if (blockLocation.isPlotArea()) {
                     blocks.remove(i);
                 }

Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java

@@ -67,16 +67,6 @@ public class ChunkListener implements Listener {
     private RefMethod methodGetHandleChunk;
     private RefMethod methodGetHandleWorld;
     private RefField mustSave;
-    /*
-    private RefMethod methodGetFullChunk;
-    private RefMethod methodGetBukkitChunk;
-    private RefMethod methodGetChunkProvider;
-    private RefMethod methodGetVisibleMap;
-    private RefField worldServer;
-    private RefField playerChunkMap;
-    private RefField updatingChunks;
-    private RefField visibleChunks;
-    */
     private Chunk lastChunk;
     private boolean ignoreUnload = false;
     private boolean isTrueForNotSave = true;

Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java

@@ -113,15 +113,7 @@ public class EntityEventListener implements Listener {
             return;
         }
         Entity victim = event.getEntity();
-/*
+
-        if (victim.getType().equals(EntityType.ITEM_FRAME)) {
-            Plot plot = BukkitUtil.getLocation(victim).getPlot();
-            if (plot != null && !plot.isAdded(damager.getUniqueId())) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-*/
         if (!BukkitEntityUtil.entityDamage(damager, victim, event.getCause())) {
             if (event.isCancelled()) {
                 if (victim instanceof Ageable ageable) {
@@ -145,37 +137,54 @@ public class EntityEventListener implements Listener {
         }
         CreatureSpawnEvent.SpawnReason reason = event.getSpawnReason();
         switch (reason.toString()) {
-            case "DISPENSE_EGG", "EGG", "OCELOT_BABY", "SPAWNER_EGG" -> {
+            case "DISPENSE_EGG":
+            case "EGG":
+            case "OCELOT_BABY":
+            case "SPAWNER_EGG":
                 if (!area.isSpawnEggs()) {
                     event.setCancelled(true);
                     return;
                 }
-            }
+                break;
-            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL",
+            case "REINFORCEMENTS":
-                    "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
+            case "NATURAL":
+            case "MOUNT":
+            case "PATROL":
+            case "RAID":
+            case "SHEARED":
+            case "SILVERFISH_BLOCK":
+            case "ENDER_PEARL":
+            case "TRAP":
+            case "VILLAGE_DEFENSE":
+            case "VILLAGE_INVASION":
+            case "BEEHIVE":
+            case "CHUNK_GEN":
                 if (!area.isMobSpawning()) {
                     event.setCancelled(true);
                     return;
                 }
-            }
+                break;
-            case "BREEDING" -> {
+            case "BREEDING":
                 if (!area.isSpawnBreeding()) {
                     event.setCancelled(true);
                     return;
                 }
-            }
+                break;
-            case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER", "CUSTOM" -> {
+            case "BUILD_IRONGOLEM":
+            case "BUILD_SNOWMAN":
+            case "BUILD_WITHER":
+            case "CUSTOM":
                 if (!area.isSpawnCustom() && entity.getType() != EntityType.ARMOR_STAND) {
                     event.setCancelled(true);
                     return;
                 }
-            }
+                break;
-            case "SPAWNER" -> {
+            case "SPAWNER":
                 if (!area.isMobSpawnerSpawning()) {
                     event.setCancelled(true);
                     return;
                 }
-            }
+                break;
         }
         Plot plot = area.getOwnedPlotAbs(location);
         if (plot == null) {

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java

@@ -178,41 +178,59 @@ public class PaperListener implements Listener {
         }
         CreatureSpawnEvent.SpawnReason reason = event.getReason();
         switch (reason.toString()) {
-            case "DISPENSE_EGG", "EGG", "OCELOT_BABY", "SPAWNER_EGG" -> {
+            case "DISPENSE_EGG":
+            case "EGG":
+            case "OCELOT_BABY":
+            case "SPAWNER_EGG":
                 if (!area.isSpawnEggs()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
                     return;
                 }
-            }
+                break;
-            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL", "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
+            case "REINFORCEMENTS":
+            case "NATURAL":
+            case "MOUNT":
+            case "PATROL":
+            case "RAID":
+            case "SHEARED":
+            case "SILVERFISH_BLOCK":
+            case "ENDER_PEARL":
+            case "TRAP":
+            case "VILLAGE_DEFENSE":
+            case "VILLAGE_INVASION":
+            case "BEEHIVE":
+            case "CHUNK_GEN":
                 if (!area.isMobSpawning()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
                     return;
                 }
-            }
+                break;
-            case "BREEDING" -> {
+            case "BREEDING":
                 if (!area.isSpawnBreeding()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
                     return;
                 }
-            }
+                break;
-            case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER", "CUSTOM" -> {
+            case "BUILD_IRONGOLEM":
+            case "BUILD_SNOWMAN":
+            case "BUILD_WITHER":
+            case "CUSTOM":
                 if (!area.isSpawnCustom() && event.getType() != EntityType.ARMOR_STAND) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
                     return;
                 }
-            }
+                break;
-            case "SPAWNER" -> {
+            case "SPAWNER":
                 if (!area.isMobSpawnerSpawning()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
                     return;
                 }
-            }
+                break;
         }
         Plot plot = location.getOwnedPlotAbs();
         if (plot == null) {

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener113.java

@@ -0,0 +1,93 @@
+/*
+ * PlotSquared, a land and world management plugin for Minecraft.
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ * Copyright (C) IntellectualSites team and contributors
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.bukkit.listener;
+
+import com.google.inject.Inject;
+import com.plotsquared.bukkit.util.BukkitUtil;
+import com.plotsquared.core.configuration.Settings;
+import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.location.Location;
+import com.plotsquared.core.player.PlotPlayer;
+import com.plotsquared.core.plot.PlotArea;
+import com.plotsquared.core.plot.world.PlotAreaManager;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import org.bukkit.block.Banner;
+import org.bukkit.block.Beacon;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.CommandBlock;
+import org.bukkit.block.Comparator;
+import org.bukkit.block.Conduit;
+import org.bukkit.block.Container;
+import org.bukkit.block.CreatureSpawner;
+import org.bukkit.block.DaylightDetector;
+import org.bukkit.block.EnchantingTable;
+import org.bukkit.block.EndGateway;
+import org.bukkit.block.EnderChest;
+import org.bukkit.block.Jukebox;
+import org.bukkit.block.Sign;
+import org.bukkit.block.Skull;
+import org.bukkit.block.Structure;
+import org.bukkit.block.data.type.Bed;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+/**
+ * @deprecated P2 effectively no longer supports 1.13
+ */
+@Deprecated(forRemoval = true, since = "6.10.4")
+public class PaperListener113 extends PaperListener {
+
+    @Inject
+    public PaperListener113(@NonNull PlotAreaManager plotAreaManager) {
+        super(plotAreaManager);
+    }
+
+    @EventHandler
+    public void onBlockPlace(BlockPlaceEvent event) {
+        if (!Settings.Paper_Components.TILE_ENTITY_CHECK || !Settings.Enabled_Components.CHUNK_PROCESSOR) {
+            return;
+        }
+        BlockState state = event.getBlock().getState(false);
+        if (!(state instanceof Banner || state instanceof Beacon || state instanceof Bed || state instanceof CommandBlock
+                || state instanceof Comparator || state instanceof Conduit || state instanceof Container || state instanceof CreatureSpawner
+                || state instanceof DaylightDetector || state instanceof EnchantingTable || state instanceof EnderChest || state instanceof EndGateway
+                || state instanceof Jukebox || state instanceof Sign || state instanceof Skull || state instanceof Structure)) {
+            return;
+        }
+        final Location location = BukkitUtil.adapt(event.getBlock().getLocation());
+        final PlotArea plotArea = location.getPlotArea();
+        if (plotArea == null) {
+            return;
+        }
+        final int tileEntityCount = event.getBlock().getChunk().getTileEntities(false).length;
+        if (tileEntityCount >= Settings.Chunk_Processor.MAX_TILES) {
+            final PlotPlayer<?> plotPlayer = BukkitUtil.adapt(event.getPlayer());
+            plotPlayer.sendMessage(
+                    TranslatableCaption.of("errors.tile_entity_cap_reached"),
+                    TagResolver.resolver("amount", Tag.inserting(Component.text(Settings.Chunk_Processor.MAX_TILES)))
+            );
+            event.setCancelled(true);
+            event.setBuild(false);
+        }
+    }
+
+}

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java

@@ -273,7 +273,8 @@ public class PlayerEventListener implements Listener {
         Plot plot = plotPlayer.getCurrentPlot();
         // Check WorldEdit
         switch (parts[0]) {
-            case "up", "worldedit:up" -> {
+            case "up":
+            case "worldedit:up":
                 if (plot == null || (!plot.isAdded(plotPlayer.getUUID()) && !plotPlayer.hasPermission(
                         Permission.PERMISSION_ADMIN_BUILD_OTHER,
                         true
@@ -281,7 +282,6 @@ public class PlayerEventListener implements Listener {
                     event.setCancelled(true);
                     return;
                 }
-            }
         }
         if (plot == null && !area.isRoadFlags()) {
             return;
@@ -844,10 +844,6 @@ public class PlayerEventListener implements Listener {
     @SuppressWarnings("deprecation")
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onInventoryClick(InventoryClickEvent event) {
-        /*if (!event.isLeftClick() || (event.getAction() != InventoryAction.PLACE_ALL) || event
-            .isShiftClick()) {
-            return;
-        }*/
         HumanEntity entity = event.getWhoClicked();
         if (!(entity instanceof Player) || !this.plotAreaManager
                 .hasPlotArea(entity.getWorld().getName())) {
@@ -1116,13 +1112,13 @@ public class PlayerEventListener implements Listener {
         Location location = BukkitUtil.adapt(block.getLocation());
         Action action = event.getAction();
         switch (action) {
-            case PHYSICAL -> {
+            case PHYSICAL: {
                 eventType = PlayerBlockEventType.TRIGGER_PHYSICAL;
                 blocktype1 = BukkitAdapter.asBlockType(block.getType());
+                break;
             }
-
             //todo rearrange the right click code. it is all over the place.
-            case RIGHT_CLICK_BLOCK -> {
+            case RIGHT_CLICK_BLOCK: {
                 Material blockType = block.getType();
                 eventType = PlayerBlockEventType.INTERACT_BLOCK;
                 blocktype1 = BukkitAdapter.asBlockType(block.getType());
@@ -1144,16 +1140,21 @@ public class PlayerEventListener implements Listener {
 
                 // in the following, lb needs to have the material of the item in hand i.e. type
                 switch (type.toString()) {
-                    case "REDSTONE", "STRING", "PUMPKIN_SEEDS", "MELON_SEEDS", "COCOA_BEANS", "WHEAT_SEEDS", "BEETROOT_SEEDS",
+                    case "REDSTONE":
-                            "SWEET_BERRIES", "GLOW_BERRIES" -> {
+                    case "STRING":
+                    case "PUMPKIN_SEEDS":
+                    case "MELON_SEEDS":
+                    case "COCOA_BEANS":
+                    case "WHEAT_SEEDS":
+                    case "BEETROOT_SEEDS":
+                    case "SWEET_BERRIES":
+                    case "GLOW_BERRIES":
                         return;
-                    }
+                    default:
-                    default -> {
                         //eventType = PlayerBlockEventType.PLACE_BLOCK;
                         if (type.isBlock()) {
                             return;
                         }
-                    }
                 }
                 if (PaperLib.isPaper()) {
                     if (MaterialTags.SPAWN_EGGS.isTagged(type) || Material.EGG.equals(type)) {
@@ -1167,7 +1168,7 @@ public class PlayerEventListener implements Listener {
                     }
                 }
                 if (type.isEdible()) {
-                    //Allow all players to eat while also allowing the block place event to be fired
+                    //Allow all players to eat while also allowing the block place event ot be fired
                     return;
                 }
                 if (type == Material.ARMOR_STAND) {
@@ -1186,8 +1187,9 @@ public class PlayerEventListener implements Listener {
                     eventType = PlayerBlockEventType.READ;
                     break;
                 }
+                break;
             }
-            case LEFT_CLICK_BLOCK -> {
+            case LEFT_CLICK_BLOCK: {
                 Material blockType = block.getType();
 
                 // todo: when the code above is rearranged, it would be great to beautify this as well.
@@ -1198,10 +1200,10 @@ public class PlayerEventListener implements Listener {
 
                 eventType = PlayerBlockEventType.INTERACT_BLOCK;
                 blocktype1 = BukkitAdapter.asBlockType(block.getType());
+                break;
             }
-            default -> {
+            default:
                 return;
-            }
         }
         if (this.worldEdit != null && pp.getAttribute("worldedit")) {
             if (event.getMaterial() == Material.getMaterial(this.worldEdit.getConfiguration().wandItem)) {

Bukkit/src/main/java/com/plotsquared/bukkit/listener/SingleWorldListener.java

@@ -89,11 +89,6 @@ public class SingleWorldListener implements Listener {
         markChunkAsClean(event.getChunk());
     }
 
-    //    @EventHandler
-    //    public void onPopulate(ChunkPopulateEvent event) {
-    //        handle(event);
-    //    }
-
     @EventHandler(priority = EventPriority.LOWEST)
     public void onChunkLoad(ChunkLoadEvent event) {
         handle(event);

Bukkit/src/main/java/com/plotsquared/bukkit/managers/HyperverseWorldManager.java

@@ -0,0 +1,63 @@
+/*
+ * PlotSquared, a land and world management plugin for Minecraft.
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ * Copyright (C) IntellectualSites team and contributors
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.bukkit.managers;
+
+/*
+import com.google.inject.Singleton;
+import org.bukkit.World;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import se.hyperver.hyperverse.Hyperverse;
+import se.hyperver.hyperverse.world.WorldConfiguration;
+import se.hyperver.hyperverse.world.WorldConfigurationBuilder;
+import se.hyperver.hyperverse.world.WorldFeatures;
+import se.hyperver.hyperverse.world.WorldType;
+
+Hyperverse implementation is currently put on ice until Hyperverse is released on a stable line and deployed to the central
+repository.
+
+@Singleton
+public class HyperverseWorldManager extends BukkitWorldManager {
+
+    @Override
+    public @Nullable World handleWorldCreation(@NonNull String worldName, @Nullable String generator) {
+        // First let Bukkit register the world
+        this.setGenerator(worldName, generator);
+        // Create the world
+        final WorldConfigurationBuilder worldConfigurationBuilder = WorldConfiguration.builder()
+                .setName(worldName).setType(WorldType.OVER_WORLD);
+        if (generator != null) {
+            worldConfigurationBuilder.setGenerator(generator).setWorldFeatures(WorldFeatures.FLATLAND);
+        }
+        try {
+            return Hyperverse.getApi().createWorld(worldConfigurationBuilder.createWorldConfiguration())
+                    .getBukkitWorld();
+        } catch (final Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    @Override
+    public String getName() {
+        return "bukkit-hyperverse";
+    }
+
+}
+ */

Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java

@@ -41,13 +41,9 @@ public class BukkitOfflinePlayer implements OfflinePlotPlayer {
      * @param player            Bukkit OfflinePlayer player to convert
      * @param permissionHandler Permission Profile to be used
      */
-    public BukkitOfflinePlayer(
+    public BukkitOfflinePlayer(final @NonNull OfflinePlayer player, final @NonNull PermissionHandler permissionHandler) {
-            final @NonNull OfflinePlayer player, final @NonNull
-    PermissionHandler permissionHandler
-    ) {
         this.player = player;
-        this.permissionProfile = permissionHandler.getPermissionProfile(this)
+        this.permissionProfile = permissionHandler.getPermissionProfile(this).orElse(NullPermissionProfile.INSTANCE);
-                .orElse(NullPermissionProfile.INSTANCE);
     }
 
     @NonNull

Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java

@@ -71,8 +71,29 @@ public class BukkitPlayer extends PlotPlayer<Player> {
      * @param eventDispatcher   EventDispatcher instance
      * @param player            Bukkit player instance
      * @param permissionHandler PermissionHandler instance
+     * @deprecated Please do not use this method. Instead use {@link BukkitUtil#adapt(Player)}, as it caches player objects.
+     *         This method will be made private in a future release.
      */
-    BukkitPlayer(
+    @Deprecated(forRemoval = true, since = "TODO")
+    public BukkitPlayer(
+            final @NonNull PlotAreaManager plotAreaManager,
+            final @NonNull EventDispatcher eventDispatcher,
+            final @NonNull Player player,
+            final @NonNull PermissionHandler permissionHandler
+    ) {
+        this(plotAreaManager, eventDispatcher, player, false, permissionHandler);
+    }
+
+    /**
+     * @param plotAreaManager   PlotAreaManager instance
+     * @param eventDispatcher   EventDispatcher instance
+     * @param player            Bukkit player instance
+     * @param permissionHandler PermissionHandler instance
+     * @deprecated Please do not use this method. Instead use {@link BukkitUtil#adapt(Player)}, as it caches player objects.
+     *         This method will be made private in a future release.
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
+    public BukkitPlayer(
             final @NonNull PlotAreaManager plotAreaManager,
             final @NonNull EventDispatcher eventDispatcher,
             final @NonNull Player player,
@@ -176,10 +197,6 @@ public class BukkitPlayer extends PlotPlayer<Player> {
             final Set<PermissionAttachmentInfo> effective = player.getEffectivePermissions();
             if (!effective.isEmpty()) {
                 for (PermissionAttachmentInfo attach : effective) {
-                    // Ignore all "false" permissions
-                    if (!attach.getValue()) {
-                        continue;
-                    }
                     String permStr = attach.getPermission();
                     if (permStr.startsWith(stubPlus)) {
                         hasAny = true;

Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayerManager.java

@@ -54,6 +54,7 @@ public class BukkitPlayerManager extends PlayerManager<BukkitPlayer, Player> {
 
     @NonNull
     @Override
+    @SuppressWarnings("deprecation")
     public BukkitPlayer getPlayer(final @NonNull Player object) {
         if (object.getUniqueId().version() == 2) { // not a real player
             return new BukkitPlayer(this.plotAreaManager, this.eventDispatcher, object, false, this.permissionHandler);
@@ -65,12 +66,13 @@ public class BukkitPlayerManager extends PlayerManager<BukkitPlayer, Player> {
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public @NonNull BukkitPlayer createPlayer(final @NonNull UUID uuid) {
         final Player player = Bukkit.getPlayer(uuid);
         if (player == null || !player.isOnline()) {
             throw new NoSuchPlayerException(uuid);
         }
-        return new BukkitPlayer(this.plotAreaManager, this.eventDispatcher, player, false, this.permissionHandler);
+        return new BukkitPlayer(this.plotAreaManager, this.eventDispatcher, player, this.permissionHandler);
     }
 
     @Nullable

Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java

@@ -18,8 +18,6 @@
  */
 package com.plotsquared.bukkit.schematic;
 
-import com.destroystokyo.paper.profile.PlayerProfile;
-import com.destroystokyo.paper.profile.ProfileProperty;
 import com.plotsquared.bukkit.util.BukkitUtil;
 import com.sk89q.jnbt.ByteTag;
 import com.sk89q.jnbt.CompoundTag;
@@ -30,22 +28,16 @@ import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.blocks.BaseItemStack;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.world.item.ItemType;
-import io.papermc.lib.PaperLib;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.DyeColor;
 import org.bukkit.World;
-import org.bukkit.block.Banner;
 import org.bukkit.block.Block;
 import org.bukkit.block.Container;
 import org.bukkit.block.Sign;
 import org.bukkit.block.Skull;
-import org.bukkit.block.banner.Pattern;
-import org.bukkit.block.banner.PatternType;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
@@ -54,15 +46,20 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Objects;
-import java.util.UUID;
 
 public class StateWrapper {
 
-    public CompoundTag tag;
+    public org.bukkit.block.BlockState state = null;
+    public CompoundTag tag = null;
 
-    private boolean paperErrorTextureSent = false;
+    /**
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + StateWrapper.class.getSimpleName());
+     * @deprecated in favour of using WE methods for obtaining NBT, specifically by obtaining a
+     *         {@link com.sk89q.worldedit.world.block.BaseBlock} and then using {@link com.sk89q.worldedit.world.block.BaseBlock#getNbtData()}
+     */
+    @Deprecated(forRemoval = true, since = "6.9.0")
+    public StateWrapper(org.bukkit.block.BlockState state) {
+        this.state = state;
+    }
 
     public StateWrapper(CompoundTag tag) {
         this.tag = tag;
@@ -240,64 +237,15 @@ public class StateWrapper {
                         return true;
                     }
                     String player = skullOwner.getString("Name");
-
+                    if (player == null || player.isEmpty()) {
-                    if (player != null && !player.isEmpty()) {
-                        try {
-                            skull.setOwningPlayer(Bukkit.getOfflinePlayer(player));
-                            skull.update(true);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                        return true;
-                    }
-
-                    final CompoundTag properties = (CompoundTag) skullOwner.getValue().get("Properties");
-                    if (properties == null) {
                         return false;
                     }
-                    final ListTag textures = properties.getListTag("textures");
+                    try {
-                    if (textures.getValue().isEmpty()) {
+                        skull.setOwningPlayer(Bukkit.getOfflinePlayer(player));
-                        return false;
+                        skull.update(true);
+                    } catch (Exception e) {
+                        e.printStackTrace();
                     }
-                    final CompoundTag textureCompound = (CompoundTag) textures.getValue().get(0);
-                    if (textureCompound == null) {
-                        return false;
-                    }
-                    String textureValue = textureCompound.getString("Value");
-                    if (textureValue == null) {
-                        return false;
-                    }
-                    if (!PaperLib.isPaper()) {
-                        if (!paperErrorTextureSent) {
-                            paperErrorTextureSent = true;
-                            LOGGER.error("Failed to populate skull data in your road schematic - This is a Spigot limitation.");
-                        }
-                        return false;
-                    }
-                    final PlayerProfile profile = Bukkit.createProfile(UUID.randomUUID());
-                    profile.setProperty(new ProfileProperty("textures", textureValue));
-                    skull.setPlayerProfile(profile);
-                    skull.update(true);
-                    return true;
-
-                }
-                return false;
-            }
-            case "banner" -> {
-                if (state instanceof Banner banner) {
-                    List<Tag> patterns = this.tag.getListTag("Patterns").getValue();
-                    if (patterns == null || patterns.isEmpty()) {
-                        return false;
-                    }
-                    banner.setPatterns(patterns.stream().map(t -> (CompoundTag) t).map(compoundTag -> {
-                        DyeColor color = DyeColor.getByWoolData((byte) compoundTag.getInt("Color"));
-                        PatternType patternType = PatternType.getByIdentifier(compoundTag.getString("Pattern"));
-                        if (color == null || patternType == null) {
-                            return null;
-                        }
-                        return new Pattern(color, patternType);
-                    }).filter(Objects::nonNull).toList());
-                    banner.update(true);
                     return true;
                 }
                 return false;
@@ -306,6 +254,26 @@ public class StateWrapper {
         return false;
     }
 
+    /**
+     * Get a CompoundTag of the contents of a block's inventory (chest, furnace, etc.).
+     *
+     * @deprecated in favour of using WorldEdit methods for obtaining NBT, specifically by obtaining a
+     *         {@link com.sk89q.worldedit.world.block.BaseBlock} and then using {@link com.sk89q.worldedit.world.block.BaseBlock#getNbtData()}
+     */
+    @Deprecated(forRemoval = true, since = "6.9.0")
+    public CompoundTag getTag() {
+        if (this.tag != null) {
+            return this.tag;
+        }
+        if (this.state instanceof InventoryHolder inv) {
+            ItemStack[] contents = inv.getInventory().getContents();
+            Map<String, Tag> values = new HashMap<>();
+            values.put("Items", new ListTag(CompoundTag.class, serializeInventory(contents)));
+            return new CompoundTag(values);
+        }
+        return null;
+    }
+
     public String getId() {
         String tileid = this.tag.getString("id").toLowerCase();
         if (tileid.startsWith("minecraft:")) {

Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java

@@ -69,8 +69,9 @@ public class BukkitRegionManager extends RegionManager {
 
     @Inject
     public BukkitRegionManager(
-            @NonNull WorldUtil worldUtil, @NonNull GlobalBlockQueue blockQueue, @NonNull
+            @NonNull WorldUtil worldUtil,
-    ProgressSubscriberFactory subscriberFactory
+            @NonNull GlobalBlockQueue blockQueue,
+            @NonNull ProgressSubscriberFactory subscriberFactory
     ) {
         super(worldUtil, blockQueue, subscriberFactory);
         this.blockQueue = blockQueue;
@@ -257,7 +258,7 @@ public class BukkitRegionManager extends RegionManager {
             map.saveEntitiesOut(Bukkit.getWorld(world.getName()).getChunkAt(x, z), currentPlotClear);
             AugmentedUtils.bypass(
                     ignoreAugment,
-                    () -> ChunkManager.setChunkInPlotArea(null, new RunnableVal<ZeroedDelegateScopedQueueCoordinator>() {
+                    () -> ChunkManager.setChunkInPlotArea(null, new RunnableVal<>() {
                         @Override
                         public void run(ZeroedDelegateScopedQueueCoordinator value) {
                             Location min = value.getMin();

Bukkit/src/main/java/com/plotsquared/bukkit/util/ContentMap.java

@@ -31,7 +31,6 @@ import org.apache.logging.log4j.Logger;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -85,28 +84,6 @@ public class ContentMap {
         }
     }
 
-    void saveEntitiesIn(Chunk chunk, CuboidRegion region, boolean delete) {
-        for (Entity entity : chunk.getEntities()) {
-            Location location = BukkitUtil.adapt(entity.getLocation());
-            int x = location.getX();
-            int z = location.getZ();
-            if (!BukkitChunkManager.isIn(region, x, z)) {
-                continue;
-            }
-            if (entity.getVehicle() != null) {
-                continue;
-            }
-            EntityWrapper wrap = new ReplicatingEntityWrapper(entity, (short) 2);
-            wrap.saveEntity();
-            this.entities.add(wrap);
-            if (delete) {
-                if (!(entity instanceof Player)) {
-                    entity.remove();
-                }
-            }
-        }
-    }
-
     void restoreEntities(World world) {
         for (EntityWrapper entity : this.entities) {
             try {

Bukkit/src/main/java/com/plotsquared/bukkit/util/TranslationUpdateManager.java

@@ -28,32 +28,24 @@ import java.nio.file.Paths;
 import java.util.stream.Stream;
 
 /**
- * This is a helper class which replaces older syntax no longer supported by MiniMessage with replacements in messages_%.json.
+ * This is a helper class which replaces occurrences of 'suggest_command' with 'run_command' in messages_%.json.
  * MiniMessage changed the syntax between major releases. To warrant a smooth upgrade, we attempt to replace any occurrences
  * while loading PlotSquared.
  *
- * @since 7.0.0
+ * @since TODO
  */
 @NotPublic
 public class TranslationUpdateManager {
 
     public static void upgradeTranslationFile() throws IOException {
-        String suggestCommand = "suggest_command";
+        String searchText = "suggest_command";
-        String suggestCommandReplacement = "run_command";
+        String replacementText = "run_command";
-        String minHeight = "minHeight";
-        String minheightReplacement = "minheight";
-        String maxHeight = "maxHeight";
-        String maxheightReplacement = "maxheight";
 
         try (Stream<Path> paths = Files.walk(Paths.get(PlotSquared.platform().getDirectory().toPath().resolve("lang").toUri()))) {
             paths
                     .filter(Files::isRegularFile)
                     .filter(p -> p.getFileName().toString().matches("messages_[a-z]{2}\\.json"))
-                    .forEach(p -> {
+                    .forEach(p -> replaceInFile(p, searchText, replacementText));
-                        replaceInFile(p, suggestCommand, suggestCommandReplacement);
-                        replaceInFile(p, minHeight, minheightReplacement);
-                        replaceInFile(p, maxHeight, maxheightReplacement);
-                    });
         }
     }
 

Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java

@@ -54,8 +54,8 @@ public class UpdateUtility implements Listener {
         internalVersion = PlotSquared.get().getVersion();
     }
 
-    @SuppressWarnings({"deprecation", "DefaultCharset"})
     // Suppress Json deprecation, we can't use features from gson 2.8.1 and newer yet
+    @SuppressWarnings({"deprecation", "DefaultCharset"})
     public void updateChecker() {
         task = Bukkit.getScheduler().runTaskTimerAsynchronously(this.javaPlugin, () -> {
             try {

Bukkit/src/main/resources/plugin.yml

@@ -4,16 +4,16 @@ api-version: "1.13"
 version: "${version}"
 load: STARTUP
 description: "Easy, yet powerful Plot World generation and management."
-authors: [ Citymonstret, Empire92, MattBDev, dordsor21, NotMyFault, SirYwell ]
+authors: [Citymonstret, Empire92, MattBDev, dordsor21, NotMyFault, SirYwell]
 website: https://www.spigotmc.org/resources/77506/
-softdepend: [ Vault, PlaceholderAPI, Essentials, LuckPerms, BungeePerms, MVdWPlaceholderAPI ]
+softdepend: [Vault, PlaceholderAPI, Essentials, LuckPerms, BungeePerms, MVdWPlaceholderAPI]
-loadbefore: [ MultiWorld, Multiverse-Core ]
+loadbefore: [MultiWorld, Multiverse-Core]
-depend: [ WorldEdit ]
+depend: [WorldEdit]
 database: false
 commands:
   plots:
     description: Plot command.
-    aliases: [ p,plot,ps,plotsquared,p2,2,plotme ]
+    aliases: [p,plot,ps,plotsquared,p2,2,plotme]
     permission: plots.use
     permission-message: "You are lacking the permission node 'plots.use'"
 permissions:

CODE_OF_CONDUCT.md

@@ -23,13 +23,13 @@ include:
 Examples of unacceptable behavior by participants include:
 
 * The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
+ advances
 * Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
 * Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
+ address, without explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
-  professional setting
+ professional setting
 
 ## Our Responsibilities
 
@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at contact<at>intellectualsites.com. All
+reported by contacting the project team at contact@intellectualsites.com. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

Core/build.gradle.kts

@@ -68,8 +68,8 @@ tasks {
         val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
         val opt = options as StandardJavadocDocletOptions
         opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString())
-        opt.links("https://jd.advntr.dev/api/4.14.0/")
+        opt.links("https://jd.adventure.kyori.net/api/4.12.0/")
-        opt.links("https://jd.advntr.dev/text-minimessage/4.14.0/")
+        opt.links("https://jd.adventure.kyori.net/text-minimessage/4.12.0/")
         opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
         opt.links("https://checkerframework.org/api/")
         opt.links("https://javadoc.io/doc/com.intellectualsites.informative-annotations/informative-annotations/latest/")

Core/src/main/java/com/plotsquared/core/PlotPlatform.java

@@ -203,7 +203,7 @@ public interface PlotPlatform<P> extends LocaleHolder {
      * @return Player manager
      */
     default @NonNull PlayerManager<? extends PlotPlayer<P>, ? extends P> playerManager() {
-        return injector().getInstance(Key.get(new TypeLiteral<PlayerManager<? extends PlotPlayer<P>, ? extends P>>() {
+        return injector().getInstance(Key.get(new TypeLiteral<>() {
         }));
     }
 

Core/src/main/java/com/plotsquared/core/PlotSquared.java

@@ -133,8 +133,6 @@ public class PlotSquared {
     private final Map<String, CaptionMap> captionMaps = new HashMap<>();
     public HashMap<String, HashMap<PlotId, Plot>> plots_tmp;
     private CaptionLoader captionLoader;
-    // WorldEdit instance
-    private WorldEdit worldedit;
     private File configFile;
     private File worldsFile;
     private YamlConfiguration worldConfiguration;
@@ -223,11 +221,11 @@ public class PlotSquared {
                 }
             }
 
-            this.worldedit = WorldEdit.getInstance();
+            WorldEdit worldedit = WorldEdit.getInstance();
             WorldEdit.getInstance().getEventBus().register(new WEPlatformReadyListener());
 
             // Create Event utility class
-            this.eventDispatcher = new EventDispatcher(this.worldedit);
+            this.eventDispatcher = new EventDispatcher(worldedit);
             // Create plot listener
             this.plotListener = new PlotListener(this.eventDispatcher);
 
@@ -1015,7 +1013,7 @@ public class PlotSquared {
 
     /**
      * Setup the configuration for a plot world based on world arguments.
-     * <p>
+     *
      *
      * <i>e.g. /mv create &lt;world&gt; normal -g PlotSquared:&lt;args&gt;</i>
      *
@@ -1525,10 +1523,6 @@ public class PlotSquared {
         return this.backgroundUUIDPipeline;
     }
 
-    public @NonNull WorldEdit getWorldEdit() {
-        return this.worldedit;
-    }
-
     public @NonNull File getConfigFile() {
         return this.configFile;
     }

Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java

@@ -136,9 +136,7 @@ public class SimpleBackupManager implements BackupManager {
         return this.backupLimit;
     }
 
-    private record PlotCacheKey(
+    private record PlotCacheKey(Plot plot) {
-            Plot plot
-    ) {
 
         @Override
         public boolean equals(final Object o) {

Core/src/main/java/com/plotsquared/core/collection/QuadMap.java

@@ -173,7 +173,7 @@ public class QuadMap<T> {
 
     public QuadMap<T> newInstance(int newsize, int x, int z, int min) {
         try {
-            return new QuadMap<T>(newsize, x, z, min) {
+            return new QuadMap<>(newsize, x, z, min) {
                 @Override
                 public CuboidRegion getRegion(T value) {
                     return QuadMap.this.getRegion(value);

Core/src/main/java/com/plotsquared/core/command/Area.java

@@ -55,7 +55,6 @@ import com.plotsquared.core.util.TabCompletions;
 import com.plotsquared.core.util.WorldUtil;
 import com.plotsquared.core.util.task.RunnableVal3;
 import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.EditSessionBuilder;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.entity.Player;
@@ -233,11 +232,13 @@ public class Area extends SubCommand {
                 try (final ClipboardWriter clipboardWriter = BuiltInClipboardFormat.SPONGE_SCHEMATIC.getWriter(new FileOutputStream(
                         file))) {
                     final BlockArrayClipboard clipboard = new BlockArrayClipboard(selectedRegion);
-                    EditSessionBuilder editSessionBuilder = WorldEdit.getInstance().newEditSessionBuilder();
+                    final EditSession editSession = WorldEdit.getInstance().newEditSession(selectedRegion.getWorld());
-                    editSessionBuilder.world(selectedRegion.getWorld());
+                    final ForwardExtentCopy forwardExtentCopy = new ForwardExtentCopy(
-                    final EditSession editSession = editSessionBuilder.build();
+                            editSession,
-                    final ForwardExtentCopy forwardExtentCopy =
+                            selectedRegion,
-                            new ForwardExtentCopy(editSession, selectedRegion, clipboard, selectedRegion.getMinimumPoint());
+                            clipboard,
+                            selectedRegion.getMinimumPoint()
+                    );
                     forwardExtentCopy.setCopyingBiomes(true);
                     forwardExtentCopy.setCopyingEntities(true);
                     Operations.complete(forwardExtentCopy);
@@ -724,7 +725,7 @@ public class Area extends SubCommand {
                         return false;
                 }
                 final List<PlotArea> areas = new ArrayList<>(Arrays.asList(this.plotAreaManager.getAllPlotAreas()));
-                paginate(player, areas, 8, page, new RunnableVal3<Integer, PlotArea, CaptionHolder>() {
+                paginate(player, areas, 8, page, new RunnableVal3<>() {
                     @Override
                     public void run(Integer i, PlotArea area, CaptionHolder caption) {
                         String name;

Core/src/main/java/com/plotsquared/core/command/Auto.java

@@ -35,7 +35,6 @@ import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.world.PlotAreaManager;
-import com.plotsquared.core.services.plots.AutoQuery;
 import com.plotsquared.core.services.plots.AutoService;
 import com.plotsquared.core.util.EconHandler;
 import com.plotsquared.core.util.EventDispatcher;
@@ -296,13 +295,10 @@ public class Auto extends SubCommand {
         }
         if (this.econHandler != null && plotarea.useEconomy()) {
             PlotExpression costExp = plotarea.getPrices().get("claim");
-            PlotExpression mergeCostExp = plotarea.getPrices().get("merge");
-            int size = sizeX * sizeZ;
-            double mergeCost = size <= 1 || mergeCostExp == null ? 0d : mergeCostExp.evaluate(size);
             double cost = costExp.evaluate(Settings.Limit.GLOBAL ?
                     player.getPlotCount() :
                     player.getPlotCount(plotarea.getWorldName()));
-            cost = size * cost + mergeCost;
+            cost = (sizeX * sizeZ) * cost;
             if (cost > 0d) {
                 if (!this.econHandler.isSupported()) {
                     player.sendMessage(TranslatableCaption.of("economy.vault_or_consumer_null"));
@@ -330,7 +326,7 @@ public class Auto extends SubCommand {
         }
 
         List<Plot> plots = this.servicePipeline
-                .pump(new AutoQuery(player, null, sizeX, sizeZ, plotarea))
+                .pump(new AutoService.AutoQuery(player, null, sizeX, sizeZ, plotarea))
                 .through(AutoService.class)
                 .getResult();
 

Core/src/main/java/com/plotsquared/core/command/Caps.java

@@ -83,7 +83,7 @@ public class Caps extends SubCommand {
         final int current = countedEntities[type];
         final int max = plot.getFlag(capFlag);
         final String percentage = String.format("%.1f", 100 * ((float) current / max));
-        ComponentLike maxBeautified = max >= Integer.MAX_VALUE
+        ComponentLike maxBeautified = max == Integer.MAX_VALUE
                 ? TranslatableCaption.of("info.infinite").toComponent(player)
                 : Component.text(max);
         player.sendMessage(

Core/src/main/java/com/plotsquared/core/command/Clear.java

@@ -107,35 +107,38 @@ public class Clear extends Command {
             }
             BackupManager.backup(player, plot, () -> {
                 final long start = System.currentTimeMillis();
-                boolean result = plot.getPlotModificationManager().clear(true, false, player, () -> TaskManager.runTask(() -> {
+                boolean result = plot.getPlotModificationManager().clear(true, false, player, () -> {
-                    plot.removeRunning();
+                    plot.getPlotModificationManager().unlink();
-                    // If the state changes, then mark it as no longer done
+                    TaskManager.runTask(() -> {
-                    if (DoneFlag.isDone(plot)) {
+                        plot.removeRunning();
-                        PlotFlag<?, ?> plotFlag =
+                        // If the state changes, then mark it as no longer done
-                                plot.getFlagContainer().getFlag(DoneFlag.class);
+                        if (DoneFlag.isDone(plot)) {
-                        PlotFlagRemoveEvent event = this.eventDispatcher
+                            PlotFlag<?, ?> plotFlag =
-                                .callFlagRemove(plotFlag, plot);
+                                    plot.getFlagContainer().getFlag(DoneFlag.class);
-                        if (event.getEventResult() != Result.DENY) {
+                            PlotFlagRemoveEvent event = this.eventDispatcher
-                            plot.removeFlag(event.getFlag());
+                                    .callFlagRemove(plotFlag, plot);
+                            if (event.getEventResult() != Result.DENY) {
+                                plot.removeFlag(event.getFlag());
+                            }
                         }
-                    }
+                        if (!plot.getFlag(AnalysisFlag.class).isEmpty()) {
-                    if (!plot.getFlag(AnalysisFlag.class).isEmpty()) {
+                            PlotFlag<?, ?> plotFlag =
-                        PlotFlag<?, ?> plotFlag =
+                                    plot.getFlagContainer().getFlag(AnalysisFlag.class);
-                                plot.getFlagContainer().getFlag(AnalysisFlag.class);
+                            PlotFlagRemoveEvent event = this.eventDispatcher
-                        PlotFlagRemoveEvent event = this.eventDispatcher
+                                    .callFlagRemove(plotFlag, plot);
-                                .callFlagRemove(plotFlag, plot);
+                            if (event.getEventResult() != Result.DENY) {
-                        if (event.getEventResult() != Result.DENY) {
+                                plot.removeFlag(event.getFlag());
-                            plot.removeFlag(event.getFlag());
+                            }
                         }
-                    }
+                        player.sendMessage(
-                    player.sendMessage(
+                                TranslatableCaption.of("working.clearing_done"),
-                            TranslatableCaption.of("working.clearing_done"),
+                                TagResolver.builder()
-                            TagResolver.builder()
+                                        .tag("amount", Tag.inserting(Component.text(System.currentTimeMillis() - start)))
-                                    .tag("amount", Tag.inserting(Component.text(System.currentTimeMillis() - start)))
+                                        .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
-                                    .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
+                                        .build()
-                                    .build()
+                        );
-                    );
+                    });
-                }));
+                });
                 if (!result) {
                     player.sendMessage(TranslatableCaption.of("errors.wait_for_timer"));
                 } else {

Core/src/main/java/com/plotsquared/core/command/Cluster.java

@@ -813,8 +813,7 @@ public class Cluster extends SubCommand {
                             if (throwable instanceof TimeoutException) {
                                 player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout"));
                             } else {
-                                final String owner;
+                                final String owner = Objects.requireNonNullElse(username, "unknown");
-                                owner = Objects.requireNonNullElse(username, "unknown");
                                 String name = cluster.getName();
                                 String size = (cluster.getP2().getX() - cluster.getP1().getX() + 1) + "x" + (
                                         cluster.getP2().getY() - cluster.getP1().getY() + 1);

Core/src/main/java/com/plotsquared/core/command/Command.java

@@ -502,9 +502,9 @@ public abstract class Command {
 
     public String getCommandString() {
         if (this.parent == null) {
-            return "/" + toString();
+            return "/" + this;
         } else {
-            return this.parent.getCommandString() + " " + toString();
+            return this.parent.getCommandString() + " " + this;
         }
     }
 
@@ -559,10 +559,9 @@ public abstract class Command {
 
     public Collection<Command> tab(PlotPlayer<?> player, String[] args, boolean space) {
         switch (args.length) {
-            case 0 -> {
+            case 0:
                 return this.allCommands;
-            }
+            case 1:
-            case 1 -> {
                 String arg = args[0].toLowerCase();
                 if (space) {
                     Command cmd = getCommand(arg);
@@ -581,15 +580,13 @@ public abstract class Command {
                     }
                     return commands;
                 }
-            }
+            default:
-            default -> {
                 Command cmd = getCommand(args[0]);
                 if (cmd != null) {
                     return cmd.tab(player, Arrays.copyOfRange(args, 1, args.length), space);
                 } else {
                     return null;
                 }
-            }
         }
     }
 

Core/src/main/java/com/plotsquared/core/command/Confirm.java

@@ -37,7 +37,7 @@ public class Confirm extends SubCommand {
         }
         CmdConfirm.removePending(player);
         if ((System.currentTimeMillis() - command.timestamp)
-                > Settings.Confirmation.CONFIRMATION_TIMEOUT_SECONDS * 1000) {
+                > Settings.Confirmation.CONFIRMATION_TIMEOUT_SECONDS * 1000L) {
             player.sendMessage(TranslatableCaption.of("confirm.expired_confirm"));
             return false;
         }

Core/src/main/java/com/plotsquared/core/command/DebugPaste.java

@@ -71,9 +71,9 @@ public class DebugPaste extends SubCommand {
                 StringBuilder b = new StringBuilder();
                 b.append(
                         """
-                                # Welcome to this paste
+                         # Welcome to this paste
-                                # It is meant to provide us at IntellectualSites with better information about your problem
+                         # It is meant to provide us at IntellectualSites with better information about your problem
-                                """
+                         """
                 );
                 b.append("# PlotSquared Information\n");
                 b.append("PlotSquared Version: ").append(PlotSquared.get().getVersion())

Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java

@@ -75,19 +75,16 @@ public class DebugRoadRegen extends SubCommand {
         }
         String kind = args[0].toLowerCase();
         switch (kind) {
-            case "plot" -> {
+            case "plot":
                 return regenPlot(player);
-            }
+            case "region":
-            case "region" -> {
                 return regenRegion(player, Arrays.copyOfRange(args, 1, args.length));
-            }
+            default:
-            default -> {
                 player.sendMessage(
                         TranslatableCaption.of("commandconfig.command_syntax"),
                         TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
                 );
                 return false;
-            }
         }
     }
 

Core/src/main/java/com/plotsquared/core/command/Done.java

@@ -103,7 +103,7 @@ public class Done extends SubCommand {
                 public void run(PlotAnalysis value) {
                     plot.removeRunning();
                     boolean result =
-                            value.getComplexity(doneRequirements) >= doneRequirements.THRESHOLD;
+                            value.getComplexity(doneRequirements) <= doneRequirements.THRESHOLD;
                     finish(plot, player, result);
                 }
             });

Core/src/main/java/com/plotsquared/core/command/Download.java

@@ -183,27 +183,22 @@ public class Download extends SubCommand {
 
     private void upload(PlotPlayer<?> player, Plot plot) {
         if (Settings.Web.LEGACY_WEBINTERFACE) {
-            schematicHandler
+            schematicHandler.getCompoundTag(plot).whenComplete((compoundTag, throwable) -> schematicHandler.upload(
-                    .getCompoundTag(plot)
+                    compoundTag,
-                    .whenComplete((compoundTag, throwable) -> schematicHandler.upload(
+                    null,
-                            compoundTag,
+                    null,
-                            null,
+                    new RunnableVal<>() {
-                            null,
+                        @Override
-                            new RunnableVal<>() {
+                        public void run(URL value) {
-                                @Override
+                            plot.removeRunning();
-                                public void run(URL value) {
+                            player.sendMessage(TranslatableCaption.of("web.generation_link_success"), TagResolver.builder().tag(
-                                    plot.removeRunning();
+                                    "download",
-                                    player.sendMessage(
+                                    Tag.preProcessParsed(value.toString())
-                                            TranslatableCaption.of("web.generation_link_success"),
+                            ).tag("delete", Tag.preProcessParsed("Not available")).build());
-                                            TagResolver.builder()
+                            player.sendMessage(StaticCaption.of(value.toString()));
-                                                    .tag("download", Tag.preProcessParsed(value.toString()))
+                        }
-                                                    .tag("delete", Tag.preProcessParsed("Not available"))
+                    }
-                                                    .build()
+            ));
-                                    );
-                                    player.sendMessage(StaticCaption.of(value.toString()));
-                                }
-                            }
-                    ));
             return;
         }
         // TODO legacy support

Core/src/main/java/com/plotsquared/core/command/Help.java

@@ -60,10 +60,9 @@ public class Help extends Command {
             RunnableVal2<Command, CommandResult> whenDone
     ) {
         switch (args.length) {
-            case 0 -> {
+            case 0:
                 return displayHelp(player, null, 0);
-            }
+            case 1:
-            case 1 -> {
                 if (MathMan.isInteger(args[0])) {
                     try {
                         return displayHelp(player, null, Integer.parseInt(args[0]));
@@ -73,8 +72,7 @@ public class Help extends Command {
                 } else {
                     return displayHelp(player, args[0], 1);
                 }
-            }
+            case 2:
-            case 2 -> {
                 if (MathMan.isInteger(args[1])) {
                     try {
                         return displayHelp(player, args[0], Integer.parseInt(args[1]));
@@ -83,8 +81,8 @@ public class Help extends Command {
                     }
                 }
                 return CompletableFuture.completedFuture(false);
-            }
+            default:
-            default -> sendUsage(player);
+                sendUsage(player);
         }
         return CompletableFuture.completedFuture(true);
     }

Core/src/main/java/com/plotsquared/core/command/Inbox.java

@@ -190,7 +190,7 @@ public class Inbox extends SubCommand {
         final int page;
         if (args.length > 1) {
             switch (args[1].toLowerCase()) {
-                case "delete" -> {
+                case "delete":
                     if (!inbox.canModify(plot, player)) {
                         player.sendMessage(TranslatableCaption.of("comment.no_perm_inbox_modify"));
                         return false;
@@ -225,6 +225,7 @@ public class Inbox extends SubCommand {
                         );
                         return false;
                     }
+
                     if (!inbox.getComments(plot, new RunnableVal<>() {
                         @Override
                         public void run(List<PlotComment> value) {
@@ -253,8 +254,7 @@ public class Inbox extends SubCommand {
                         return false;
                     }
                     return true;
-                }
+                case "clear":
-                case "clear" -> {
                     if (!inbox.canModify(plot, player)) {
                         player.sendMessage(TranslatableCaption.of("comment.no_perm_inbox_modify"));
                     }
@@ -268,15 +268,13 @@ public class Inbox extends SubCommand {
                         plot.getPlotCommentContainer().removeComments(comments);
                     }
                     return true;
-                }
+                default:
-                default -> {
                     try {
                         page = Integer.parseInt(args[1]);
                     } catch (NumberFormatException ignored) {
                         sendUsage(player);
                         return false;
                     }
-                }
             }
         } else {
             page = 1;

Core/src/main/java/com/plotsquared/core/command/Kick.java

@@ -112,15 +112,15 @@ public class Kick extends SubCommand {
                 for (PlotPlayer<?> player2 : players) {
                     if (!plot.equals(player2.getCurrentPlot())) {
                         player.sendMessage(
-                                TranslatableCaption.of("kick.player_not_in_plot"),
+                                TranslatableCaption.of("errors.invalid_player"),
-                                TagResolver.resolver("player", Tag.inserting(Component.text(player2.getName())))
+                                TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
                         );
                         return;
                     }
                     if (player2.hasPermission(Permission.PERMISSION_ADMIN_ENTRY_DENIED)) {
                         player.sendMessage(
-                                TranslatableCaption.of("kick.cannot_kick_player"),
+                                TranslatableCaption.of("cluster.cannot_kick_player"),
-                                TagResolver.resolver("player", Tag.inserting(Component.text(player2.getName())))
+                                TagResolver.resolver("name", Tag.inserting(Component.text(player2.getName())))
                         );
                         return;
                     }

Core/src/main/java/com/plotsquared/core/command/ListCmd.java

@@ -117,7 +117,7 @@ public class ListCmd extends SubCommand {
         if (player.hasPermission(Permission.PERMISSION_LIST_FUZZY)) {
             args.add("fuzzy <search...>");
         }
-        return args.toArray(new String[args.size()]);
+        return args.toArray(new String[0]);
     }
 
     public void noArgs(PlotPlayer<?> player) {

Core/src/main/java/com/plotsquared/core/command/Music.java

@@ -56,7 +56,7 @@ public class Music extends SubCommand {
             .asList("music_disc_13", "music_disc_cat", "music_disc_blocks", "music_disc_chirp",
                     "music_disc_far", "music_disc_mall", "music_disc_mellohi", "music_disc_stal",
                     "music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait", "music_disc_otherside",
-                    "music_disc_pigstep", "music_disc_5", "music_disc_relic"
+                    "music_disc_pigstep", "music_disc_5"
             );
 
     private final InventoryUtil inventoryUtil;

Core/src/main/java/com/plotsquared/core/command/Near.java

@@ -28,7 +28,6 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 @CommandDeclaration(command = "near",
@@ -56,8 +55,4 @@ public class Near extends Command {
         return CompletableFuture.completedFuture(true);
     }
 
-    private List<PlotPlayer<?>> getPlayersInPlotVisible(Plot plot, PlotPlayer<?> executor) {
-        return plot.getPlayersInPlot().stream().filter(executor::canSee).toList();
-    }
-
 }

Core/src/main/java/com/plotsquared/core/command/Purge.java

@@ -90,8 +90,12 @@ public class Purge extends SubCommand {
                 return false;
             }
             switch (split[0].toLowerCase()) {
-                case "world", "w" -> world = split[1];
+                case "world":
-                case "area", "a" -> {
+                case "w":
+                    world = split[1];
+                    break;
+                case "area":
+                case "a":
                     area = this.plotAreaManager.getPlotAreaByString(split[1]);
                     if (area == null) {
                         player.sendMessage(
@@ -100,8 +104,9 @@ public class Purge extends SubCommand {
                         );
                         return false;
                     }
-                }
+                    break;
-                case "plotid", "id" -> {
+                case "plotid":
+                case "id":
                     try {
                         id = PlotId.fromString(split[1]);
                     } catch (IllegalArgumentException ignored) {
@@ -111,8 +116,9 @@ public class Purge extends SubCommand {
                         );
                         return false;
                     }
-                }
+                    break;
-                case "owner", "o" -> {
+                case "owner":
+                case "o":
                     UUIDMapping ownerMapping = PlotSquared.get().getImpromptuUUIDPipeline().getImmediately(split[1]);
                     if (ownerMapping == null) {
                         player.sendMessage(
@@ -122,8 +128,9 @@ public class Purge extends SubCommand {
                         return false;
                     }
                     owner = ownerMapping.uuid();
-                }
+                    break;
-                case "shared", "s" -> {
+                case "shared":
+                case "s":
                     UUIDMapping addedMapping = PlotSquared.get().getImpromptuUUIDPipeline().getImmediately(split[1]);
                     if (addedMapping == null) {
                         player.sendMessage(
@@ -133,13 +140,22 @@ public class Purge extends SubCommand {
                         return false;
                     }
                     added = addedMapping.uuid();
-                }
+                    break;
-                case "clear", "c", "delete", "d", "del" -> clear = Boolean.parseBoolean(split[1]);
+                case "clear":
-                case "unknown", "?", "u" -> unknown = Boolean.parseBoolean(split[1]);
+                case "c":
-                default -> {
+                case "delete":
+                case "d":
+                case "del":
+                    clear = Boolean.parseBoolean(split[1]);
+                    break;
+                case "unknown":
+                case "?":
+                case "u":
+                    unknown = Boolean.parseBoolean(split[1]);
+                    break;
+                default:
                     sendUsage(player);
                     return false;
-                }
             }
         }
         final HashSet<Plot> toDelete = new HashSet<>();
@@ -220,7 +236,10 @@ public class Purge extends SubCommand {
                             try {
                                 ids.add(plot.temp);
                                 if (finalClear) {
-                                    plot.getPlotModificationManager().clear(false, true, player,
+                                    plot.getPlotModificationManager().clear(
+                                            false,
+                                            true,
+                                            player,
                                             () -> LOGGER.info("Plot {} cleared by purge", plot.getId())
                                     );
                                 } else {

Core/src/main/java/com/plotsquared/core/components/ComponentPreset.java

@@ -35,22 +35,14 @@ import java.util.Map;
  * the component GUI
  */
 @SerializableAs("preset")
-public record ComponentPreset(
+public record ComponentPreset(ClassicPlotManagerComponent component, String pattern, double cost, String permission,
-        ClassicPlotManagerComponent component,
+                              String displayName, List<String> description, ItemType icon) implements ConfigurationSerializable {
-        String pattern,
-        double cost,
-        String permission,
-        String displayName,
-        List<String> description,
-        ItemType icon
-) implements ConfigurationSerializable {
 
     @SuppressWarnings("unchecked")
     public static ComponentPreset deserialize(final @NonNull Map<String, Object> map) {
         final ClassicPlotManagerComponent classicPlotManagerComponent = ClassicPlotManagerComponent
                 .fromString(map.getOrDefault("component", "").toString()).orElseThrow(() ->
-                        new IllegalArgumentException("The preset in components.yml needs a valid target component, got: " + map.get(
+                        new IllegalArgumentException("The preset needs a valid target component"));
-                                "component")));
         final String pattern = map.getOrDefault("pattern", "").toString();
         final double cost = Double.parseDouble(map.getOrDefault("cost", "0.0").toString());
         final String permission = map.getOrDefault("permission", "").toString();

Core/src/main/java/com/plotsquared/core/configuration/Config.java

@@ -233,6 +233,7 @@ public class Config {
      *
      * @param split    the node (split by period)
      * @param instance the instance
+     * @return
      */
     private static Field getField(String[] split, Object instance) {
         try {

Core/src/main/java/com/plotsquared/core/configuration/caption/Caption.java

@@ -40,7 +40,7 @@ public interface Caption {
      *
      * @param localeHolder Locale holder
      * @return {@link ComponentLike}
-     * @since 7.0.0
+     * @since TODO
      */
     @NonNull Component toComponent(@NonNull LocaleHolder localeHolder);
 

Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionHolder.java

@@ -51,7 +51,7 @@ public class CaptionHolder {
      * Get the {@link TagResolver}s to use when resolving tags in the {@link Caption}.
      *
      * @return The tag resolvers to use.
-     * @since 7.0.0
+     * @since TODO
      */
     public TagResolver[] getTagResolvers() {
         return this.tagResolvers;
@@ -61,7 +61,7 @@ public class CaptionHolder {
      * Set the {@link TagResolver}s to use when resolving tags in the {@link Caption}.
      *
      * @param tagResolvers The tag resolvers to use.
-     * @since 7.0.0
+     * @since TODO
      */
     public void setTagResolvers(TagResolver... tagResolvers) {
         this.tagResolvers = tagResolvers;

Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionUtility.java

@@ -28,20 +28,16 @@ import com.plotsquared.core.plot.flag.implementations.PlotTitleFlag;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.ParsingException;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import static com.plotsquared.core.configuration.caption.ComponentTransform.nested;
 import static com.plotsquared.core.configuration.caption.ComponentTransform.stripClicks;
 
 public class CaptionUtility {
 
-    private static final Pattern LEGACY_FORMATTING = Pattern.compile("§[a-gklmnor0-9]");
-
     // flags which values are parsed by minimessage
     private static final Set<Class<? extends PlotFlag<?, ?>>> MINI_MESSAGE_FLAGS = Set.of(
             GreetingFlag.class,
@@ -104,14 +100,7 @@ public class CaptionUtility {
      */
     public static String stripClickEvents(final @NonNull String miniMessageString) {
         // parse, transform and serialize again
-        Component component;
+        Component component = MiniMessage.miniMessage().deserialize(miniMessageString);
-        try {
-            component = MiniMessage.miniMessage().deserialize(miniMessageString);
-        } catch (ParsingException e) {
-            // if the String cannot be parsed, we try stripping legacy colors
-            String legacyStripped = LEGACY_FORMATTING.matcher(miniMessageString).replaceAll("");
-            component = MiniMessage.miniMessage().deserialize(legacyStripped);
-        }
         component = CLICK_STRIP_TRANSFORM.transform(component);
         return MiniMessage.miniMessage().serialize(component);
     }

Core/src/main/java/com/plotsquared/core/configuration/caption/load/CaptionLoader.java

@@ -146,7 +146,6 @@ public final class CaptionLoader {
      * @param reader the reader to read the map from.
      * @return the translation map.
      */
-    @SuppressWarnings("UnstableApiUsage")
     static @NonNull Map<@NonNull String, @NonNull String> loadFromReader(final @NonNull Reader reader) {
         final Type type = new TypeToken<Map<String, String>>() {
         }.getType();

Core/src/main/java/com/plotsquared/core/configuration/file/YamlConstructor.java

@@ -19,7 +19,6 @@
 package com.plotsquared.core.configuration.file;
 
 import com.plotsquared.core.configuration.serialization.ConfigurationSerialization;
-import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
 import org.yaml.snakeyaml.error.YAMLException;
 import org.yaml.snakeyaml.nodes.Node;
@@ -31,7 +30,6 @@ import java.util.Map;
 public class YamlConstructor extends SafeConstructor {
 
     YamlConstructor() {
-        super(new LoaderOptions());
         yamlConstructors.put(Tag.MAP, new ConstructCustomObject());
     }
 

Core/src/main/java/com/plotsquared/core/configuration/file/YamlRepresenter.java

@@ -21,7 +21,6 @@ package com.plotsquared.core.configuration.file;
 import com.plotsquared.core.configuration.ConfigurationSection;
 import com.plotsquared.core.configuration.serialization.ConfigurationSerializable;
 import com.plotsquared.core.configuration.serialization.ConfigurationSerialization;
-import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.nodes.Node;
 import org.yaml.snakeyaml.representer.Representer;
 
@@ -31,7 +30,6 @@ import java.util.Map;
 class YamlRepresenter extends Representer {
 
     YamlRepresenter() {
-        super(new DumperOptions());
         this.multiRepresenters.put(ConfigurationSection.class, new RepresentConfigurationSection());
         this.multiRepresenters
                 .put(ConfigurationSerializable.class, new RepresentConfigurationSerializable());

Core/src/main/java/com/plotsquared/core/database/SQLManager.java

@@ -2499,7 +2499,7 @@ public class SQLManager implements AbstractDB {
                             id = null;
                         }
                         String msg = set.getString("comment");
-                        long timestamp = set.getInt("timestamp") * 1000;
+                        long timestamp = set.getInt("timestamp") * 1000L;
                         PlotComment comment =
                                 new PlotComment(world, id, msg, sender, inbox, timestamp);
                         comments.add(comment);
@@ -3414,10 +3414,7 @@ public class SQLManager implements AbstractDB {
         }
     }
 
-    private record LegacySettings(
+    private record LegacySettings(int id, PlotSettings settings) {
-            int id,
-            PlotSettings settings
-    ) {
 
     }
 

Core/src/main/java/com/plotsquared/core/events/EntityEvent.java

@@ -1,64 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * 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 <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.core.events;
-
-import com.sk89q.worldedit.entity.Entity;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-/**
- * @since 6.11.1
- */
-public abstract class EntityEvent {
-
-    private final Entity entity;
-
-    private String name;
-
-    /**
-     * @since 6.11.0
-     */
-    public EntityEvent(Entity entity) {
-        this.entity = entity;
-    }
-
-    /**
-     * Obtain the entity involved in the event
-     *
-     * @return Entity
-     * @since 6.11.0
-     */
-    public Entity getEntity() {
-        return this.entity;
-    }
-
-    /**
-     * Obtain the event's class name
-     *
-     * @return the event class name
-     * @since 6.11.0
-     */
-    @NonNull
-    public String getEventName() {
-        if (this.name == null) {
-            this.name = this.getClass().getSimpleName();
-        }
-        return this.name;
-    }
-
-}

Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java

@@ -105,6 +105,38 @@ public class PlayerAutoPlotEvent extends PlotEvent implements CancellablePlotEve
         return this.plotArea;
     }
 
+    /**
+     * @deprecated for removal. Use {@link PlayerAutoPlotEvent#getSizeX()}
+     */
+    @Deprecated(forRemoval = true, since = "6.1.0")
+    public int getSize_x() {
+        return getSizeX();
+    }
+
+    /**
+     * @deprecated for removal. Use {@link PlayerAutoPlotEvent#setSizeX(int)}
+     */
+    @Deprecated(forRemoval = true, since = "6.1.0")
+    public void setSize_x(int sizeX) {
+        setSizeX(sizeX);
+    }
+
+    /**
+     * @deprecated for removal. Use {@link PlayerAutoPlotEvent#getSizeZ()}
+     */
+    @Deprecated(forRemoval = true, since = "6.1.0")
+    public int getSize_z() {
+        return getSizeZ();
+    }
+
+    /**
+     * @deprecated for removal. Use {@link PlayerAutoPlotEvent#setSizeZ(int)}
+     */
+    @Deprecated(forRemoval = true, since = "6.1.0")
+    public void setSize_z(int sizeZ) {
+        setSizeZ(sizeZ);
+    }
+
     /**
      * Get the x size of the auto-area
      *

Core/src/main/java/com/plotsquared/core/events/RemoveRoadEntityEvent.java

@@ -1,50 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * 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 <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.core.events;
-
-import com.sk89q.worldedit.entity.Entity;
-
-/**
- * @since 6.11.0
- */
-public class RemoveRoadEntityEvent extends EntityEvent implements CancellablePlotEvent {
-
-    private Result eventResult;
-
-    /**
-     * RemoveRoadEntityEvent: Called when an entity on road is removed.
-     *
-     * @param entity The entity to remove
-     * @since 6.11.0
-     */
-    public RemoveRoadEntityEvent(Entity entity) {
-        super(entity);
-    }
-
-    @Override
-    public Result getEventResult() {
-        return this.eventResult;
-    }
-
-    @Override
-    public void setEventResult(Result eventResult) {
-        this.eventResult = eventResult;
-    }
-
-}

Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java

@@ -379,11 +379,10 @@ public class ClassicPlotManager extends SquarePlotManager {
             }
         }
 
-        int yStart = classicPlotWorld.getMinBuildHeight() + (classicPlotWorld.PLOT_BEDROCK ? 1 : 0);
         if (!plot.isMerged(Direction.NORTH)) {
             int z = bot.getZ();
             for (int x = bot.getX(); x < top.getX(); x++) {
-                for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }
@@ -391,7 +390,7 @@ public class ClassicPlotManager extends SquarePlotManager {
         if (!plot.isMerged(Direction.WEST)) {
             int x = bot.getX();
             for (int z = bot.getZ(); z < top.getZ(); z++) {
-                for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }
@@ -399,7 +398,7 @@ public class ClassicPlotManager extends SquarePlotManager {
         if (!plot.isMerged(Direction.SOUTH)) {
             int z = top.getZ();
             for (int x = bot.getX(); x < top.getX() + (plot.isMerged(Direction.EAST) ? 0 : 1); x++) {
-                for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }
@@ -407,7 +406,7 @@ public class ClassicPlotManager extends SquarePlotManager {
         if (!plot.isMerged(Direction.EAST)) {
             int x = top.getX();
             for (int z = bot.getZ(); z < top.getZ() + (plot.isMerged(Direction.SOUTH) ? 0 : 1); z++) {
-                for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }

Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java

@@ -65,21 +65,6 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
         super(worldName, id, generator, min, max, worldConfiguration, blockQueue);
     }
 
-    private static BlockBucket createCheckedBlockBucket(String input, BlockBucket def) {
-        final BlockBucket bucket = new BlockBucket(input);
-        Pattern pattern = null;
-        try {
-            pattern = bucket.toPattern();
-        } catch (Exception ignore) {
-        }
-        if (pattern == null) {
-            LOGGER.error("Failed to parse pattern '{}', check your worlds.yml", input);
-            LOGGER.error("Falling back to {}", def);
-            return def;
-        }
-        return bucket;
-    }
-
     /**
      * CONFIG NODE | DEFAULT VALUE | DESCRIPTION | CONFIGURATION TYPE | REQUIRED FOR INITIAL SETUP.
      *
@@ -160,4 +145,19 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
         return Math.min(WALL_HEIGHT, plotRoadMin);
     }
 
+    private static BlockBucket createCheckedBlockBucket(String input, BlockBucket def) {
+        final BlockBucket bucket = new BlockBucket(input);
+        Pattern pattern = null;
+        try {
+            pattern = bucket.toPattern();
+        } catch (Exception ignore) {
+        }
+        if (pattern == null) {
+            LOGGER.error("Failed to parse pattern '{}', check your worlds.yml", input);
+            LOGGER.error("Falling back to {}", def);
+            return def;
+        }
+        return bucket;
+    }
+
 }

Core/src/main/java/com/plotsquared/core/generator/HybridGen.java

@@ -69,8 +69,8 @@ public class HybridGen extends IndependentPlotGenerator {
             EnumSet<SchematicFeature> features
     ) {
         int minY; // Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT);
-        boolean isRoad = features.contains(SchematicFeature.ROAD);
+        if ((features.contains(SchematicFeature.ROAD) && Settings.Schematics.PASTE_ROAD_ON_TOP)
-        if ((isRoad && Settings.Schematics.PASTE_ROAD_ON_TOP) || (!isRoad && Settings.Schematics.PASTE_ON_TOP)) {
+                || (!features.contains(SchematicFeature.ROAD) && Settings.Schematics.PASTE_ON_TOP)) {
             minY = world.SCHEM_Y;
         } else {
             minY = world.getMinBuildHeight();
@@ -368,7 +368,6 @@ public class HybridGen extends IndependentPlotGenerator {
                 }
             }
         }
-        return;
     }
 
     @Override
@@ -402,12 +401,6 @@ public class HybridGen extends IndependentPlotGenerator {
         return biome == null ? hybridPlotWorld.getPlotBiome() : biome;
     }
 
-    private enum SchematicFeature {
-        BIOMES,
-        ROAD,
-        POPULATING
-    }
-
     /**
      * Wrapper to allow a WorldEdit {@link Entity} to effectively have a mutable location as the location in its NBT should be changed
      * when set to the world.
@@ -462,4 +455,10 @@ public class HybridGen extends IndependentPlotGenerator {
 
     }
 
+    private enum SchematicFeature {
+        BIOMES,
+        ROAD,
+        POPULATING
+    }
+
 }

Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java

@@ -162,7 +162,6 @@ public class HybridPlotManager extends ClassicPlotManager {
         } else {
             minY = hybridPlotWorld.getMinBuildHeight();
         }
-        int schemYDiff = (isRoad ? hybridPlotWorld.getRoadYStart() : hybridPlotWorld.getPlotYStart()) - minY;
         BaseBlock airBlock = BlockTypes.AIR.getDefaultState().toBaseBlock();
         for (int x = pos1.getX(); x <= pos2.getX(); x++) {
             short absX = (short) ((x - hybridPlotWorld.ROAD_OFFSET_X) % size);
@@ -179,14 +178,10 @@ public class HybridPlotManager extends ClassicPlotManager {
                     for (int y = 0; y < blocks.length; y++) {
                         if (blocks[y] != null) {
                             queue.setBlock(x, minY + y, z, blocks[y]);
-                        } else if (y > schemYDiff) {
+                        } else if (!isRoad) {
-                            // This is necessary, otherwise any blocks not specified in the schematic will remain after a clear.
+                            // This is necessary, otherwise any blocks not specified in the schematic will remain after a clear
-                            // This should only be done where the schematic has actually "started"
+                            //  Do not set air for road as this may cause cavernous roads when debugroadregen is used
                             queue.setBlock(x, minY + y, z, airBlock);
-                        } else if (isRoad) {
-                            queue.setBlock(x, minY + y, z, hybridPlotWorld.ROAD_BLOCK.toPattern());
-                        } else {
-                            queue.setBlock(x, minY + y, z, hybridPlotWorld.MAIN_BLOCK.toPattern());
                         }
                     }
                 }
@@ -293,13 +288,6 @@ public class HybridPlotManager extends ClassicPlotManager {
             queue.setCompleteTask(whenDone);
         }
         if (!canRegen) {
-            if (hybridPlotWorld.getMinBuildHeight() < hybridPlotWorld.getMinGenHeight()) {
-                queue.setCuboid(
-                        pos1.withY(hybridPlotWorld.getMinBuildHeight()),
-                        pos2.withY(hybridPlotWorld.getMinGenHeight()),
-                        BlockTypes.AIR.getDefaultState()
-                );
-            }
             queue.setCuboid(
                     pos1.withY(hybridPlotWorld.getMinGenHeight()),
                     pos2.withY(hybridPlotWorld.getMinGenHeight()),
@@ -317,13 +305,6 @@ public class HybridPlotManager extends ClassicPlotManager {
                     pos2.withY(hybridPlotWorld.getMaxGenHeight()),
                     BlockTypes.AIR.getDefaultState()
             );
-            if (hybridPlotWorld.getMaxGenHeight() < hybridPlotWorld.getMaxBuildHeight() - 1) {
-                queue.setCuboid(
-                        pos1.withY(hybridPlotWorld.getMaxGenHeight()),
-                        pos2.withY(hybridPlotWorld.getMaxBuildHeight() - 1),
-                        BlockTypes.AIR.getDefaultState()
-                );
-            }
             queue.setBiomeCuboid(pos1, pos2, biome);
         } else {
             queue.setRegenRegion(new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3()));

Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java

@@ -68,6 +68,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     private static final AffineTransform transform = new AffineTransform().rotateY(90);
     public boolean ROAD_SCHEMATIC_ENABLED;
     public boolean PLOT_SCHEMATIC = false;
+    @Deprecated(forRemoval = true, since = "6.9.0")
+    public int PLOT_SCHEMATIC_HEIGHT = -1;
     public short PATH_WIDTH_LOWER;
     public short PATH_WIDTH_UPPER;
     public HashMap<Integer, BaseBlock[]> G_SCH;
@@ -76,9 +78,6 @@ public class HybridPlotWorld extends ClassicPlotWorld {
      * The Y level at which schematic generation will start, lowest of either road or plot schematic generation.
      */
     public int SCHEM_Y;
-
-    private int plotY;
-    private int roadY;
     private Location SIGN_LOCATION;
     private File root = null;
     private int lastOverlayHeightError = Integer.MIN_VALUE;
@@ -105,6 +104,22 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         PlotSquared.platform().injector().injectMembers(this);
     }
 
+    @Deprecated(forRemoval = true, since = "6.9.0")
+    public static byte wrap(byte data, int start) {
+        if ((data >= start) && (data < (start + 4))) {
+            data = (byte) ((((data - start) + 2) & 3) + start);
+        }
+        return data;
+    }
+
+    @Deprecated(forRemoval = true, since = "6.9.0")
+    public static byte wrap2(byte data, int start) {
+        if ((data >= start) && (data < (start + 2))) {
+            data = (byte) ((((data - start) + 1) & 1) + start);
+        }
+        return data;
+    }
+
     public static BaseBlock rotate(BaseBlock id) {
 
         CompoundTag tag = id.getNbtData();
@@ -255,13 +270,13 @@ public class HybridPlotWorld extends ClassicPlotWorld {
 
         SCHEM_Y = schematicStartHeight();
 
-        // plotY and roadY are important to allow plot and/or road schematic "overflow" into each other
+        // plotY and roadY are important to allow plot and/or road schematic "overflow" into each other without causing AIOOB
-        // without causing AIOOB exceptions when attempting either to set blocks to, or get block from G_SCH
+        //  exceptions when attempting either to set blocks to, or get block from G_SCH
         // Default plot schematic start height, normalized to the minimum height schematics are pasted from.
-        plotY = PLOT_HEIGHT - SCHEM_Y;
+        int plotY = PLOT_HEIGHT - SCHEM_Y;
         int minRoadWall = Settings.Schematics.USE_WALL_IN_ROAD_SCHEM_HEIGHT ? Math.min(ROAD_HEIGHT, WALL_HEIGHT) : ROAD_HEIGHT;
         // Default road schematic start height, normalized to the minimum height schematics are pasted from.
-        roadY = minRoadWall - SCHEM_Y;
+        int roadY = minRoadWall - SCHEM_Y;
 
         int worldGenHeight = getMaxGenHeight() - getMinGenHeight() + 1;
 
@@ -270,15 +285,14 @@ public class HybridPlotWorld extends ClassicPlotWorld {
 
         // SCHEM_Y should be normalised to the plot "start" height
         if (schematic3 != null) {
-            plotSchemHeight = schematic3.getClipboard().getDimensions().getY();
+            plotSchemHeight = maxSchematicHeight = schematic3.getClipboard().getDimensions().getY();
-            if (plotSchemHeight == worldGenHeight) {
+            if (maxSchematicHeight == worldGenHeight) {
                 SCHEM_Y = getMinGenHeight();
                 plotY = 0;
             } else if (!Settings.Schematics.PASTE_ON_TOP) {
                 SCHEM_Y = getMinBuildHeight();
                 plotY = 0;
             }
-            maxSchematicHeight = plotY + plotSchemHeight;
         }
 
         int roadSchemHeight;
@@ -327,21 +341,11 @@ public class HybridPlotWorld extends ClassicPlotWorld {
             short w3 = (short) d3.getX();
             short l3 = (short) d3.getZ();
             short h3 = (short) d3.getY();
-            if (w3 > PLOT_WIDTH || l3 > PLOT_WIDTH) {
+            if (w3 > PLOT_WIDTH || h3 > PLOT_WIDTH) {
                 this.ROAD_SCHEMATIC_ENABLED = true;
             }
-            int centerShiftZ;
+            int centerShiftZ = (this.PLOT_WIDTH - l3) / 2;
-            if (l3 < this.PLOT_WIDTH) {
+            int centerShiftX = (this.PLOT_WIDTH - w3) / 2;
-                centerShiftZ = (this.PLOT_WIDTH - l3) / 2;
-            } else {
-                centerShiftZ = (PLOT_WIDTH - l3) / 2;
-            }
-            int centerShiftX;
-            if (w3 < this.PLOT_WIDTH) {
-                centerShiftX = (this.PLOT_WIDTH - w3) / 2;
-            } else {
-                centerShiftX = (PLOT_WIDTH - w3) / 2;
-            }
 
             BlockVector3 min = blockArrayClipboard3.getMinimumPoint();
             for (short x = 0; x < w3; x++) {
@@ -382,7 +386,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         }
         if ((schematic1 == null && schematic2 == null) || this.ROAD_WIDTH == 0) {
             if (Settings.DEBUG) {
-                LOGGER.info("- road schematic: false");
+                LOGGER.info("- schematic: false");
             }
             return;
         }
@@ -472,7 +476,11 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         }
     }
 
-    private void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate, int height) {
+    /**
+     * @deprecated This method should not be available for public API usage and will be made private.
+     */
+    @Deprecated(forRemoval = true, since = "6.10.2")
+    public void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate, int height) {
         if (z < 0) {
             z += this.SIZE;
         } else if (z >= this.SIZE) {
@@ -503,7 +511,11 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         existing[y] = id;
     }
 
-    private void addOverlayBiome(short x, short z, BiomeType id) {
+    /**
+     * @deprecated This method should not be available for public API usage and will be made private.
+     */
+    @Deprecated(forRemoval = true, since = "6.10.2")
+    public void addOverlayBiome(short x, short z, BiomeType id) {
         if (z < 0) {
             z += this.SIZE;
         } else if (z >= this.SIZE) {
@@ -548,6 +560,14 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         return schem1PopulationNeeded || schem2PopulationNeeded || schem3PopulationNeeded;
     }
 
+    /**
+     * @deprecated in favour of {@link HybridPlotWorld#getSchematicRoot()}
+     */
+    @Deprecated(forRemoval = true, since = "6.9.0")
+    public File getRoot() {
+        return this.root;
+    }
+
     /**
      * Get the root folder for this world's generation schematics. May be null if schematics not initialised via
      * {@link HybridPlotWorld#setupSchematics()}
@@ -558,24 +578,4 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         return this.root;
     }
 
-    /**
-     * Get the y value where the plot schematic should be pasted from.
-     *
-     * @return plot schematic y start value
-     * @since TODO
-     */
-    public int getPlotYStart() {
-        return SCHEM_Y + plotY;
-    }
-
-    /**
-     * Get the y value where the road schematic should be pasted from.
-     *
-     * @return road schematic y start value
-     * @since TODO
-     */
-    public int getRoadYStart() {
-        return SCHEM_Y + roadY;
-    }
-
 }

Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java

@@ -37,7 +37,6 @@ import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.queue.BlockArrayCacheScopedQueueCoordinator;
 import com.plotsquared.core.queue.GlobalBlockQueue;
 import com.plotsquared.core.queue.QueueCoordinator;
-import com.plotsquared.core.util.ChunkManager;
 import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.RegionManager;
@@ -87,7 +86,6 @@ public class HybridUtils {
     public static boolean UPDATE = false;
 
     private final PlotAreaManager plotAreaManager;
-    private final ChunkManager chunkManager;
     private final GlobalBlockQueue blockQueue;
     private final WorldUtil worldUtil;
     private final SchematicHandler schematicHandler;
@@ -96,14 +94,12 @@ public class HybridUtils {
     @Inject
     public HybridUtils(
             final @NonNull PlotAreaManager plotAreaManager,
-            final @NonNull ChunkManager chunkManager,
             final @NonNull GlobalBlockQueue blockQueue,
             final @NonNull WorldUtil worldUtil,
             final @NonNull SchematicHandler schematicHandler,
             final @NonNull EventDispatcher eventDispatcher
     ) {
         this.plotAreaManager = plotAreaManager;
-        this.chunkManager = chunkManager;
         this.blockQueue = blockQueue;
         this.worldUtil = worldUtil;
         this.schematicHandler = schematicHandler;
@@ -628,7 +624,7 @@ public class HybridUtils {
             queue = queueCoordinator;
             enqueue = false;
         }
-        if (id1 == null || id2 == null || id1 != id2) {
+        if (id2 == null || id1 != id2) {
             if (id1 != null) {
                 Plot p1 = area.getPlotAbs(id1);
                 if (p1 != null && p1.hasOwner() && p1.isMerged()) {
@@ -668,7 +664,7 @@ public class HybridUtils {
                     }
                     if (condition) {
                         BaseBlock[] blocks = plotWorld.G_SCH.get(MathMan.pair(absX, absZ));
-                        int minY = plotWorld.getRoadYStart();
+                        int minY = Settings.Schematics.PASTE_ROAD_ON_TOP ? plotWorld.SCHEM_Y : area.getMinGenHeight() + 1;
                         int maxDy = Math.max(extend, blocks.length);
                         for (int dy = 0; dy < maxDy; dy++) {
                             if (dy > blocks.length - 1) {

Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java

@@ -46,7 +46,7 @@ public abstract class IndependentPlotGenerator {
      * @param result   Queue to write to
      * @param settings PlotArea (settings)
      * @param biomes   If biomes should be generated
-     * @since 7.0.0
+     * @since TODO
      */
     public abstract void generateChunk(ZeroedDelegateScopedQueueCoordinator result, PlotArea settings, boolean biomes);
 
@@ -55,7 +55,7 @@ public abstract class IndependentPlotGenerator {
      *
      * @param result  Queue to write to
      * @param setting PlotArea (settings)
-     * @since 7.0.0
+     * @since TODO
      */
     public void populateChunk(ZeroedDelegateScopedQueueCoordinator result, PlotArea setting) {
     }
@@ -108,7 +108,7 @@ public abstract class IndependentPlotGenerator {
      * @param y        World y position
      * @param z        World z position
      * @return Biome type to be generated
-     * @since 7.0.0
+     * @since TODO
      */
     public abstract BiomeType getBiome(PlotArea settings, int x, int y, int z);
 

Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java

@@ -185,38 +185,30 @@ public abstract class SquarePlotManager extends GridPlotManager {
                 return null;
             }
             switch (hash) {
-                case 8 -> {
+                case 8:
                     // north
                     return plot.isMerged(Direction.NORTH) ? id : null;
-                }
+                case 4:
-                case 4 -> {
                     // east
                     return plot.isMerged(Direction.EAST) ? id : null;
-                }
+                case 2:
-                case 2 -> {
                     // south
                     return plot.isMerged(Direction.SOUTH) ? id : null;
-                }
+                case 1:
-                case 1 -> {
                     // west
                     return plot.isMerged(Direction.WEST) ? id : null;
-                }
+                case 12:
-                case 12 -> {
                     // northeast
                     return plot.isMerged(Direction.NORTHEAST) ? id : null;
-                }
+                case 6:
-                case 6 -> {
                     // southeast
                     return plot.isMerged(Direction.SOUTHEAST) ? id : null;
-                }
+                case 3:
-                case 3 -> {
                     // southwest
                     return plot.isMerged(Direction.SOUTHWEST) ? id : null;
-                }
+                case 9:
-                case 9 -> {
                     // northwest
                     return plot.isMerged(Direction.NORTHWEST) ? id : null;
-                }
             }
         } catch (Exception ignored) {
             LOGGER.error("Invalid plot / road width in settings.yml for world: {}", squarePlotWorld.getWorldName());

Core/src/main/java/com/plotsquared/core/listener/PlotListener.java

@@ -64,7 +64,6 @@ import com.sk89q.worldedit.world.item.ItemType;
 import com.sk89q.worldedit.world.item.ItemTypes;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
-import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -80,8 +79,6 @@ import java.util.UUID;
 
 public class PlotListener {
 
-    private static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage();
-
     private final HashMap<UUID, Interval> feedRunnable = new HashMap<>();
     private final HashMap<UUID, Interval> healRunnable = new HashMap<>();
     private final Map<UUID, List<StatusEffect>> playerEffects = new HashMap<>();
@@ -520,11 +517,6 @@ public class PlotListener {
 
     private record StatusEffect(@NonNull String name, long expiresAt) {
 
-        private StatusEffect(@NonNull String name, long expiresAt) {
-            this.name = name;
-            this.expiresAt = expiresAt;
-        }
-
     }
 
 }

Core/src/main/java/com/plotsquared/core/location/ChunkWrapper.java

@@ -21,11 +21,7 @@ package com.plotsquared.core.location;
 import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.StringMan;
 
-public record ChunkWrapper(
+public record ChunkWrapper(String world, int x, int z) {
-        String world,
-        int x,
-        int z
-) {
 
     @Override
     public int hashCode() {

Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java

@@ -60,19 +60,6 @@ public final class UncheckedWorldLocation extends Location {
         return new UncheckedWorldLocation(world, x, y, z);
     }
 
-    /**
-     * Construct a new location with yaw and pitch equal to 0
-     *
-     * @param world World
-     * @param loc   Coordinates
-     * @return New location
-     * @since 6.9.0
-     */
-    @DoNotUse
-    public static @NonNull UncheckedWorldLocation at(final @NonNull String world, BlockVector3 loc) {
-        return new UncheckedWorldLocation(world, loc.getX(), loc.getY(), loc.getZ());
-    }
-
     @Override
     @DoNotUse
     public @NonNull String getWorldName() {

Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java

@@ -215,11 +215,7 @@ public final class BlockBucket implements ConfigurationSerializable {
         return result;
     }
 
-    private record Range(
+    private record Range(int min, int max, boolean automatic) {
-            int min,
-            int max,
-            boolean automatic
-    ) {
 
         public int getWeight() {
             return max - min;
@@ -229,6 +225,31 @@ public final class BlockBucket implements ConfigurationSerializable {
             return num <= max && num >= min;
         }
 
+        public boolean equals(final Object o) {
+            if (o == this) {
+                return true;
+            }
+            if (!(o instanceof final Range other)) {
+                return false;
+            }
+            if (this.min() != other.min()) {
+                return false;
+            }
+            if (this.max() != other.max()) {
+                return false;
+            }
+            return this.automatic() == other.automatic();
+        }
+
+        public int hashCode() {
+            final int PRIME = 59;
+            int result = 1;
+            result = result * PRIME + this.min();
+            result = result * PRIME + this.max();
+            result = result * PRIME + (this.automatic() ? 79 : 97);
+            return result;
+        }
+
     }
 
 }

Core/src/main/java/com/plotsquared/core/plot/Plot.java

@@ -20,6 +20,7 @@ package com.plotsquared.core.plot;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import com.google.inject.Inject;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.command.Like;
@@ -2417,6 +2418,7 @@ public class Plot {
         if (!this.isMerged()) {
             Location pos1 = this.getBottomAbs().withY(getArea().getMinBuildHeight());
             Location pos2 = this.getTopAbs().withY(getArea().getMaxBuildHeight());
+            this.connectedCache = Sets.newHashSet(this);
             CuboidRegion rg = new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3());
             return Collections.singleton(rg);
         }

Core/src/main/java/com/plotsquared/core/plot/PlotArea.java

@@ -382,9 +382,6 @@ public abstract class PlotArea implements ComponentLike {
             this.defaultHome = new BlockLoc(Integer.MAX_VALUE, Integer.MIN_VALUE, Integer.MAX_VALUE);
         } else {
             try {
-                /*String[] split = homeDefault.split(",");
-                this.DEFAULT_HOME =
-                    new PlotLoc(Integer.parseInt(split[0]), Integer.parseInt(split[1]));*/
                 this.defaultHome = BlockLoc.fromString(homeDefault);
             } catch (NumberFormatException ignored) {
                 this.defaultHome = null;
@@ -657,9 +654,9 @@ public abstract class PlotArea implements ComponentLike {
             player.sendMessage(
                     TranslatableCaption.of("height.height_limit"),
                     TagResolver.builder()
-                            .tag("minheight", Tag.inserting(Component.text(minBuildHeight)))
+                            .tag("minHeight", Tag.inserting(Component.text(minBuildHeight)))
                             .tag(
-                                    "maxheight",
+                                    "maxHeight",
                                     Tag.inserting(Component.text(maxBuildHeight))
                             ).build()
             );

Core/src/main/java/com/plotsquared/core/plot/PlotId.java

@@ -106,6 +106,17 @@ public final class PlotId {
         return PlotId.of(hash >> 16, hash & 0xFFFF);
     }
 
+    /**
+     * Get a copy of the plot ID
+     *
+     * @return Plot ID copy
+     * @deprecated PlotId is immutable, copy is not required.
+     */
+    @Deprecated(forRemoval = true, since = "6.10.2")
+    public @NonNull PlotId copy() {
+        return this;
+    }
+
     /**
      * Get the ID X component
      *

Core/src/main/java/com/plotsquared/core/plot/PlotModificationManager.java

@@ -222,6 +222,17 @@ public final class PlotModificationManager {
         if (isDelete) {
             this.removeSign();
         }
+        PlotUnlinkEvent event = PlotSquared.get().getEventDispatcher()
+                .callUnlink(
+                        this.plot.getArea(),
+                        this.plot,
+                        true,
+                        !isDelete,
+                        isDelete ? PlotUnlinkEvent.REASON.DELETE : PlotUnlinkEvent.REASON.CLEAR
+                );
+        if (event.getEventResult() != Result.DENY && this.unlinkPlot(event.isCreateRoad(), event.isCreateSign())) {
+            PlotSquared.get().getEventDispatcher().callPostUnlink(plot, event.getReason());
+        }
         final PlotManager manager = this.plot.getArea().getPlotManager();
         Runnable run = new Runnable() {
             @Override
@@ -272,21 +283,7 @@ public final class PlotModificationManager {
                 manager.clearPlot(current, this, actor, null);
             }
         };
-        PlotUnlinkEvent event = PlotSquared.get().getEventDispatcher()
+        run.run();
-                .callUnlink(
-                        this.plot.getArea(),
-                        this.plot,
-                        true,
-                        !isDelete,
-                        isDelete ? PlotUnlinkEvent.REASON.DELETE : PlotUnlinkEvent.REASON.CLEAR
-                );
-        if (event.getEventResult() != Result.DENY) {
-            if (this.unlinkPlot(event.isCreateRoad(), event.isCreateSign(), run)) {
-                PlotSquared.get().getEventDispatcher().callPostUnlink(plot, event.getReason());
-            }
-        } else {
-            run.run();
-        }
         return true;
     }
 
@@ -326,23 +323,7 @@ public final class PlotModificationManager {
      * @return success/!cancelled
      */
     public boolean unlinkPlot(final boolean createRoad, final boolean createSign) {
-        return unlinkPlot(createRoad, createSign, null);
-    }
-
-    /**
-     * Unlink the plot and all connected plots.
-     *
-     * @param createRoad whether to recreate road
-     * @param createSign whether to recreate signs
-     * @param whenDone   Task to run when unlink is complete
-     * @return success/!cancelled
-     * @since 6.10.9
-     */
-    public boolean unlinkPlot(final boolean createRoad, final boolean createSign, final Runnable whenDone) {
         if (!this.plot.isMerged()) {
-            if (whenDone != null) {
-                whenDone.run();
-            }
             return false;
         }
         final Set<Plot> plots = this.plot.getConnectedPlots();
@@ -387,17 +368,14 @@ public final class PlotModificationManager {
                     current.getPlotModificationManager().setSign(PlayerManager.resolveName(current.getOwnerAbs()).getComponent(
                             LocaleHolder.console()));
                 }
-                if (whenDone != null) {
-                    TaskManager.runTask(whenDone);
-                }
             }));
-        } else if (whenDone != null) {
-            queue.setCompleteTask(whenDone);
         }
         if (createRoad) {
             manager.finishPlotUnlink(ids, queue);
         }
-        queue.enqueue();
+        if (queue != null) {
+            queue.enqueue();
+        }
         return true;
     }
 

Core/src/main/java/com/plotsquared/core/plot/comment/PlotComment.java

@@ -20,13 +20,6 @@ package com.plotsquared.core.plot.comment;
 
 import com.plotsquared.core.plot.PlotId;
 
-public record PlotComment(
+public record PlotComment(String world, PlotId id, String comment, String senderName, String inbox, long timestamp) {
-        String world,
-        PlotId id,
-        String comment,
-        String senderName,
-        String inbox,
-        long timestamp
-) {
 
 }

Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java

@@ -19,6 +19,7 @@
 package com.plotsquared.core.plot.expiration;
 
 import com.google.inject.Inject;
+import com.plotsquared.core.PlotPlatform;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.caption.Caption;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
@@ -62,6 +63,11 @@ import java.util.concurrent.ConcurrentLinkedDeque;
 
 public class ExpireManager {
 
+    /**
+     * @deprecated Use {@link PlotPlatform#expireManager()} instead
+     */
+    @Deprecated(forRemoval = true, since = "6.10.2")
+    public static ExpireManager IMP;
     private final ConcurrentHashMap<UUID, Long> dates_cache;
     private final ConcurrentHashMap<UUID, Long> account_age_cache;
     private final EventDispatcher eventDispatcher;

Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java

@@ -91,7 +91,6 @@ import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
 import com.plotsquared.core.plot.flag.implementations.PveFlag;
 import com.plotsquared.core.plot.flag.implementations.PvpFlag;
 import com.plotsquared.core.plot.flag.implementations.RedstoneFlag;
-import com.plotsquared.core.plot.flag.implementations.SculkSensorInteractFlag;
 import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag;
 import com.plotsquared.core.plot.flag.implementations.SnowFormFlag;
 import com.plotsquared.core.plot.flag.implementations.SnowMeltFlag;
@@ -173,7 +172,6 @@ public final class GlobalFlagContainer extends FlagContainer {
         this.addFlag(MobBreakFlag.MOB_BREAK_FALSE);
         this.addFlag(MobPlaceFlag.MOB_PLACE_FALSE);
         this.addFlag(MiscInteractFlag.MISC_INTERACT_FALSE);
-        this.addFlag(SculkSensorInteractFlag.SCULK_SENSOR_INTERACT_FALSE);
         this.addFlag(MiscPlaceFlag.MISC_PLACE_FALSE);
         this.addFlag(MycelGrowFlag.MYCEL_GROW_TRUE);
         this.addFlag(NotifyEnterFlag.NOTIFY_ENTER_FALSE);

Core/src/main/java/com/plotsquared/core/plot/flag/PlotFlag.java

@@ -88,7 +88,7 @@ public abstract class PlotFlag<T, F extends PlotFlag<T, F>> {
      * Gets the flag name as a Kyori {@link Component}
      *
      * @see #getFlagName(Class)
-     * @since 7.0.0
+     * @since TODO
      */
     public static <T, F extends PlotFlag<T, F>> Component getFlagNameComponent(Class<F> flagClass) {
         return Component.text(getFlagName(flagClass));

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/AnalysisFlag.java

@@ -19,7 +19,6 @@
 package com.plotsquared.core.plot.flag.implementations;
 
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.plot.flag.FlagParseException;
 import com.plotsquared.core.plot.flag.InternalFlag;
 import com.plotsquared.core.plot.flag.types.ListFlag;
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -34,7 +33,7 @@ public class AnalysisFlag extends ListFlag<Integer, AnalysisFlag> implements Int
     }
 
     @Override
-    public AnalysisFlag parse(@NonNull String input) throws FlagParseException {
+    public AnalysisFlag parse(@NonNull String input) {
         final String[] split = input.split(",");
         final List<Integer> numbers = new ArrayList<>();
         for (final String element : split) {

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BlockedCmdsFlag.java

@@ -19,7 +19,6 @@
 package com.plotsquared.core.plot.flag.implementations;
 
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.plot.flag.FlagParseException;
 import com.plotsquared.core.plot.flag.types.ListFlag;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
@@ -39,7 +38,7 @@ public class BlockedCmdsFlag extends ListFlag<String, BlockedCmdsFlag> {
     }
 
     @Override
-    public BlockedCmdsFlag parse(@NonNull String input) throws FlagParseException {
+    public BlockedCmdsFlag parse(@NonNull String input) {
         return flagOf(Arrays.asList(input.split(",")));
     }
 

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyTeleportFlag.java

@@ -57,15 +57,24 @@ public class DenyTeleportFlag extends PlotFlag<DenyTeleportFlag.DeniedGroup, Den
         }
         final boolean result;
         switch (value) {
-            case TRUSTED -> result = !plot.getTrusted().contains(player.getUUID());
+            case TRUSTED:
-            case MEMBERS -> result = !plot.getMembers().contains(player.getUUID());
+                result = !plot.getTrusted().contains(player.getUUID());
-            case NONMEMBERS -> result = plot.isAdded(player.getUUID());
+                break;
-            case NONTRUSTED -> result =
+            case MEMBERS:
-                    plot.getTrusted().contains(player.getUUID()) || plot.isOwner(player.getUUID());
+                result = !plot.getMembers().contains(player.getUUID());
-            case NONOWNERS -> result = plot.isOwner(player.getUUID());
+                break;
-            default -> {
+            case NONMEMBERS:
+                result = plot.isAdded(player.getUUID());
+                break;
+            case NONTRUSTED:
+                result =
+                        plot.getTrusted().contains(player.getUUID()) || plot.isOwner(player.getUUID());
+                break;
+            case NONOWNERS:
+                result = plot.isOwner(player.getUUID());
+                break;
+            default:
                 return true;
-            }
         }
         return result || player.hasPermission("plots.admin.entry.denied");
     }

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GamemodeFlag.java

@@ -19,7 +19,6 @@
 package com.plotsquared.core.plot.flag.implementations;
 
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.plot.flag.FlagParseException;
 import com.plotsquared.core.plot.flag.PlotFlag;
 import com.sk89q.worldedit.world.gamemode.GameMode;
 import com.sk89q.worldedit.world.gamemode.GameModes;
@@ -57,7 +56,7 @@ public class GamemodeFlag extends PlotFlag<GameMode, GamemodeFlag> {
     }
 
     @Override
-    public GamemodeFlag parse(@NonNull String input) throws FlagParseException {
+    public GamemodeFlag parse(@NonNull String input) {
         return switch (input) {
             case "creative", "c", "1" -> flagOf(GameModes.CREATIVE);
             case "adventure", "a", "2" -> flagOf(GameModes.ADVENTURE);

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/GuestGamemodeFlag.java

@@ -19,7 +19,6 @@
 package com.plotsquared.core.plot.flag.implementations;
 
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.plot.flag.FlagParseException;
 import com.plotsquared.core.plot.flag.PlotFlag;
 import com.sk89q.worldedit.world.gamemode.GameMode;
 import com.sk89q.worldedit.world.gamemode.GameModes;
@@ -52,7 +51,7 @@ public class GuestGamemodeFlag extends PlotFlag<GameMode, GuestGamemodeFlag> {
     }
 
     @Override
-    public GuestGamemodeFlag parse(@NonNull String input) throws FlagParseException {
+    public GuestGamemodeFlag parse(@NonNull String input) {
         return switch (input) {
             case "creative", "c", "1" -> flagOf(GameModes.CREATIVE);
             case "adventure", "a", "2" -> flagOf(GameModes.ADVENTURE);

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/SculkSensorInteractFlag.java

@@ -1,39 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * 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 <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.core.plot.flag.implementations;
-
-import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.plot.flag.types.BooleanFlag;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-public class SculkSensorInteractFlag extends BooleanFlag<SculkSensorInteractFlag> {
-
-    public static final SculkSensorInteractFlag SCULK_SENSOR_INTERACT_TRUE = new SculkSensorInteractFlag(true);
-    public static final SculkSensorInteractFlag SCULK_SENSOR_INTERACT_FALSE = new SculkSensorInteractFlag(false);
-
-    private SculkSensorInteractFlag(boolean value) {
-        super(value, TranslatableCaption.of("flags.flag_description_sculk_sensor_interact"));
-    }
-
-    @Override
-    protected SculkSensorInteractFlag flagOf(@NonNull Boolean value) {
-        return value ? SCULK_SENSOR_INTERACT_TRUE : SCULK_SENSOR_INTERACT_FALSE;
-    }
-
-}

Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeListFlag.java

@@ -30,7 +30,6 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public abstract class BlockTypeListFlag<F extends ListFlag<BlockTypeWrapper, F>>
         extends ListFlag<BlockTypeWrapper, F> {
@@ -73,11 +72,9 @@ public abstract class BlockTypeListFlag<F extends ListFlag<BlockTypeWrapper, F>>
     public Collection<String> getTabCompletions() {
         final Collection<String> tabCompletions = new ArrayList<>();
         tabCompletions.addAll(
-                BlockType.REGISTRY.keySet().stream().map(val -> val.replace("minecraft:", ""))
+                BlockType.REGISTRY.keySet().stream().map(val -> val.replace("minecraft:", "")).toList());
-                        .collect(Collectors.toList()));
         tabCompletions.addAll(
-                BlockCategory.REGISTRY.keySet().stream().map(val -> "#" + val.replace("minecraft:", ""))
+                BlockCategory.REGISTRY.keySet().stream().map(val -> "#" + val.replace("minecraft:", "")).toList());
-                        .collect(Collectors.toList()));
         return tabCompletions;
     }
 

Core/src/main/java/com/plotsquared/core/plot/flag/types/TimedFlag.java

@@ -76,10 +76,7 @@ public abstract class TimedFlag<T, F extends PlotFlag<TimedFlag.Timed<T>, F>>
         return getValue().toString();
     }
 
-    public record Timed<T>(
+    public record Timed<T>(int interval, T value) {
-            int interval,
-            T value
-    ) {
 
         @Override
         public String toString() {

Core/src/main/java/com/plotsquared/core/plot/world/DefaultPlotAreaManager.java

@@ -29,17 +29,17 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 
 @Singleton
 public class DefaultPlotAreaManager implements PlotAreaManager {
 
     final PlotArea[] noPlotAreas = new PlotArea[0];
-    private final Map<String, PlotWorld> plotWorlds = new ConcurrentHashMap<>();
+    private final Map<String, PlotWorld> plotWorlds = new HashMap<>();
 
     @Override
     public @NonNull PlotArea[] getAllPlotAreas() {

Core/src/main/java/com/plotsquared/core/plot/world/PlotAreaManager.java

@@ -111,7 +111,7 @@ public interface PlotAreaManager {
      *
      * @param worldName Name of the world to add
      * @return {@code true} if successful, {@code false} if world already existed
-     * @since 7.0.0
+     * @since TODO
      */
     boolean addWorld(@NonNull String worldName);
 

Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java

@@ -194,17 +194,6 @@ public class SinglePlotArea extends GridPlotWorld {
         } catch (final Exception e) {
             e.printStackTrace();
         }
-
-        //        String worldName = plot.getWorldName();
-        //        World world = Bukkit.getWorld(worldName);
-        //        if (world != null) {
-        //            return world;
-        //        }
-        //        WorldCreator wc = new WorldCreator(worldName);
-        //        wc.generator("PlotSquared:single");
-        //        wc.environment(World.Environment.NORMAL);
-        //        wc.type(WorldType.FLAT);
-        //        return AsyncWorld.create(wc);
     }
 
 

Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java

@@ -43,10 +43,11 @@ import java.util.function.Consumer;
 
 public abstract class QueueCoordinator {
 
-    private final AtomicBoolean enqueued = new AtomicBoolean();
     private boolean forceSync = false;
     @Nullable
     private Object chunkObject;
+    private final AtomicBoolean enqueued = new AtomicBoolean();
+
     @SuppressWarnings({"unused", "FieldCanBeLocal"})
     @Inject
     private GlobalBlockQueue blockQueue;
@@ -66,7 +67,7 @@ public abstract class QueueCoordinator {
      * @param x chunk x coordinate
      * @param z chunk z coordinate
      * @return a new {@link ZeroedDelegateScopedQueueCoordinator}
-     * @since 7.0.0
+     * @since TODO
      */
     public ZeroedDelegateScopedQueueCoordinator getForChunk(int x, int z, int minY, int maxY) {
         int bx = x << 4;
@@ -202,7 +203,7 @@ public abstract class QueueCoordinator {
      * @return success or not
      * @deprecated Biomes now take XYZ, see {@link #setBiome(int, int, int, BiomeType)}
      *         <br>
-     *         Scheduled for removal once we drop the support for versions not supporting 3D biomes, 1.18 and earlier.
+     *         Scheduled for removal once we drop the support for versions not supporting 3D biomes.
      */
     @Deprecated(forRemoval = true, since = "6.0.0")
     public abstract boolean setBiome(int x, int z, @NonNull BiomeType biome);