Drop cherry_grove if present on pre 1.20 versions

1.20 fixes

.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://forms.gle/btgdRn9yhGtzEiGW8) form!
+        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!
 
   - type: dropdown
     attributes:
@@ -27,6 +27,8 @@ 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.19.4'
         - '1.19.3'
         - '1.19.2'
         - '1.19.1'

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

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

.github/workflows/build-pr.yml

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

.github/workflows/build.yml

@@ -1,10 +1,8 @@
 name: build
-
 on:
   push:
     branches:
-      - v7
+      - main
-
 jobs:
   build:
     if: github.repository_owner == 'IntellectualSites'
@@ -30,7 +28,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/v7'}}
+        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
         run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
         env:
           ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
@@ -38,14 +36,13 @@ 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/v7' }}
+        if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
         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/v7'}}
+        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
-        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 }}
@@ -57,8 +54,7 @@ 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/v7'}}
+        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
-        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,11 +1,10 @@
 name: "CodeQL"
-
 on:
   push:
-    branches: [ v7 ]
+    branches: [ main ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ v7 ]
+    branches: [ main ]
 
 jobs:
   analyze:
@@ -15,23 +14,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,14 +1,12 @@
 name: draft release
-
 on:
   push:
     branches:
-      - v6
+      - main
   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,3 +137,7 @@ docs/
 build/
 
 .DS_Store
+# Ignore run folders
+run-[0-0].[0-9]/
+run-[0-0].[0-9].[0-9]/
+

.idea/icon.svg

@@ -1,48 +1,144 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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">
+<svg
-		<metadata id="metadata8">
+   version="1.1"
+   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 rdf:about="">
+				<cc:Work
+   rdf:about="">
 					<dc:format>image/svg+xml</dc:format>
-                    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+                    <dc:type
+   rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
 				</cc:Work>
 			</rdf:RDF>
 		</metadata>
-    <defs id="defs6">
+    <defs
-			<clipPath clipPathUnits="userSpaceOnUse" id="clipPath18">
+   id="defs6">
-				<path d="M 0,2500 H 3000 V 0 H 0 Z" id="path16" />
+			<clipPath
+   clipPathUnits="userSpaceOnUse"
+   id="clipPath18">
+				<path
+   d="M 0,2500 H 3000 V 0 H 0 Z"
+   id="path16" />
 			</clipPath>
 		</defs>
-    <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" />
+    <sodipodi:namedview
-    <g id="g10" inkscape:groupmode="layer" inkscape:label="PlotSquared" transform="matrix(1.3333333,0,0,-1.3333333,0,3333.3333)">
+   pagecolor="#ffffff"
-			<g id="g12">
+   bordercolor="#666666"
-				<g id="g14" clip-path="url(#clipPath18)">
+   borderopacity="1"
-					<g id="g20" transform="translate(1486.1511,2242.6453)">
+   objecttolerance="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" />
+   gridtolerance="10"
+   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 id="g24" transform="translate(1201.7948,1741.5303)">
+                    <g
-						<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" />
+   id="g24"
+   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 id="g28" transform="translate(919.3342,1429.7462)">
+                    <g
-						<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" />
+   id="g28"
+   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 id="g32" transform="translate(1649.134,1700.6166)">
+                    <g
-						<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" />
+   id="g32"
+   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 id="g36" transform="translate(1262.7214,1613.126)">
+                    <g
-						<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" />
+   id="g36"
+   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 id="g40" transform="translate(1966.3174,1675.6364)">
+                    <g
-						<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" />
+   id="g40"
+   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 id="g44" transform="translate(1499.3971,1669.1094)">
+                    <g
-						<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" />
+   id="g44"
+   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 id="g48" transform="translate(1748.0469,1601.6797)">
+                    <g
-						<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" />
+   id="g48"
+   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 id="g52" transform="translate(1262.7214,1613.126)">
+                    <g
-						<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" />
+   id="g52"
+   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,6 +62,7 @@ tasks.processResources {
 }
 
 tasks.named<ShadowJar>("shadowJar") {
+    dependsOn(":plotsquared-core:shadowJar")
     dependencies {
         exclude(dependency("org.checkerframework:"))
     }
@@ -102,7 +103,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.adventure.kyori.net/api/4.12.0/")
+        opt.links("https://jd.advntr.dev/api/4.14.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

@@ -49,8 +49,8 @@ import com.plotsquared.bukkit.player.BukkitPlayerManager;
 import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.bukkit.util.BukkitWorld;
 import com.plotsquared.bukkit.util.SetGenCB;
-import com.plotsquared.bukkit.util.UpdateUtility;
 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;
@@ -72,6 +72,8 @@ 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;
@@ -110,6 +112,7 @@ 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;
@@ -818,8 +821,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                         if (entity.hasMetadata("ps-tmp-teleport")) {
                                             continue;
                                         }
-                                        iterator.remove();
+                                        this.removeRoadEntity(entity, iterator);
-                                        entity.remove();
                                     }
                                     continue;
                                 }
@@ -832,8 +834,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                     if (entity.hasMetadata("ps-tmp-teleport")) {
                                         continue;
                                     }
-                                    iterator.remove();
+                                    this.removeRoadEntity(entity, iterator);
-                                    entity.remove();
                                 }
                             }
                             continue;
@@ -843,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) {
-                                entity.remove();
+                                this.removeRoadEntity(entity, iterator);
                             }
                             // dropped item
                             continue;
@@ -874,8 +875,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                                 if (entity.hasMetadata("ps-tmp-teleport")) {
                                                     continue;
                                                 }
-                                                iterator.remove();
+                                                this.removeRoadEntity(entity, iterator);
-                                                entity.remove();
                                             }
                                         }
                                     }
@@ -980,8 +980,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                                 if (entity.hasMetadata("ps-tmp-teleport")) {
                                                     continue;
                                                 }
-                                                iterator.remove();
+                                                this.removeRoadEntity(entity, iterator);
-                                                entity.remove();
                                             }
                                         }
                                     } else {
@@ -992,8 +991,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                             if (entity.hasMetadata("ps-tmp-teleport")) {
                                                 continue;
                                             }
-                                            iterator.remove();
+                                            this.removeRoadEntity(entity, iterator);
-                                            entity.remove();
                                         }
                                     }
                                 }
@@ -1007,6 +1005,17 @@ 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
     final ChunkGenerator getDefaultWorldGenerator(
@@ -1176,9 +1185,17 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
     public @NonNull String worldEditImplementations() {
         StringBuilder msg = new StringBuilder();
         if (Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit") != null) {
-            msg.append("FastAsyncWorldEdit: ").append(Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit").getDescription().getVersion());
+            msg.append("FastAsyncWorldEdit: ").append(Bukkit
+                    .getPluginManager()
+                    .getPlugin("FastAsyncWorldEdit")
+                    .getDescription()
+                    .getVersion());
         } else if (Bukkit.getPluginManager().getPlugin("AsyncWorldEdit") != null) {
-            msg.append("AsyncWorldEdit: ").append(Bukkit.getPluginManager().getPlugin("AsyncWorldEdit").getDescription().getVersion()).append("\n");
+            msg.append("AsyncWorldEdit: ").append(Bukkit
+                    .getPluginManager()
+                    .getPlugin("AsyncWorldEdit")
+                    .getDescription()
+                    .getVersion()).append("\n");
             msg.append("WorldEdit: ").append(Bukkit.getPluginManager().getPlugin("WorldEdit").getDescription().getVersion());
         } else {
             msg.append("WorldEdit: ").append(Bukkit.getPluginManager().getPlugin("WorldEdit").getDescription().getVersion());

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

@@ -101,50 +101,26 @@ 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 "EGG":
+            case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "EXPERIENCE_ORB", "FALLING_BLOCK", "FIREBALL",
-            case "ENDER_CRYSTAL":
+                    "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND", "MINECART_MOB_SPAWNER",
-            case "ENDER_PEARL":
+                    "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SLIME", "SMALL_FIREBALL", "SNOWBALL", "MINECART_FURNACE", "SPLASH_POTION",
-            case "ENDER_SIGNAL":
+                    "THROWN_EXP_BOTTLE", "WITHER_SKULL", "UNKNOWN", "SPECTRAL_ARROW", "SHULKER_BULLET", "DRAGON_FIREBALL", "AREA_EFFECT_CLOUD",
-            case "EXPERIENCE_ORB":
+                    "TRIDENT", "LLAMA_SPIT" -> {
-            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());
@@ -152,7 +128,8 @@ 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());
@@ -165,20 +142,17 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 }
                 this.dataString = art.name();
                 return;
+            }
             // END MISC //
             // INVENTORY HOLDER //
-            case "MINECART_CHEST":
+            case "MINECART_CHEST", "MINECART_HOPPER" -> {
-            case "MINECART_HOPPER":
                 storeInventory((InventoryHolder) entity);
                 return;
+            }
             // START LIVING ENTITY //
             // START AGEABLE //
             // START TAMEABLE //
-            case "HORSE":
+            case "HORSE", "DONKEY", "LLAMA", "MULE", "SKELETON_HORSE" -> {
-            case "DONKEY":
-            case "LLAMA":
-            case "MULE":
-            case "SKELETON_HORSE":
                 AbstractHorse horse = (AbstractHorse) entity;
                 this.horse = new HorseStats();
                 this.horse.jump = horse.getJumpStrength();
@@ -194,16 +168,17 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 storeLiving(horse);
                 storeInventory(horse);
                 return;
+            }
             // END INVENTORY HOLDER //
-            case "WOLF":
+            case "WOLF", "OCELOT" -> {
-            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;
@@ -214,23 +189,20 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 storeAgeable(sheep);
                 storeLiving(sheep);
                 return;
-            case "VILLAGER":
+            }
-            case "CHICKEN":
+            case "VILLAGER", "CHICKEN", "COW", "MUSHROOM_COW", "PIG", "TURTLE", "POLAR_BEAR" -> {
-            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(),
@@ -238,37 +210,30 @@ 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;
                 }
@@ -282,52 +247,37 @@ 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 "WITHER_SKELETON":
+            case "SKELETON", "WITHER_SKELETON", "GUARDIAN", "ELDER_GUARDIAN", "GHAST", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN",
-            case "GUARDIAN":
+                    "ZOMBIFIED_PIGLIN", "PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH",
-            case "ELDER_GUARDIAN":
+                    "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SHULKER", "SNOWMAN" -> {
-            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 //
         }
     }
@@ -465,20 +415,15 @@ 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 "LEASH_HITCH":
+            case "PLAYER", "LEASH_HITCH" -> {
                 return null;
-            case "ITEM_FRAME":
+            }
-                entity = world.spawn(location, ItemFrame.class);
+            case "ITEM_FRAME" -> entity = world.spawn(location, ItemFrame.class);
-                break;
+            case "PAINTING" -> entity = world.spawn(location, Painting.class);
-            case "PAINTING":
+            default -> entity = world.spawnEntity(location, this.getType());
-                entity = world.spawn(location, Painting.class);
-                break;
-            default:
-                entity = world.spawnEntity(location, this.getType());
-                break;
         }
         if (this.depth == 0) {
             return entity;
@@ -506,72 +451,46 @@ 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 "EGG":
+            case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "DROPPED_ITEM", "EXPERIENCE_ORB", "FALLING_BLOCK",
-            case "ENDER_CRYSTAL":
+                    "FIREBALL", "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND",
-            case "ENDER_PEARL":
+                    "MINECART_MOB_SPAWNER", "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SMALL_FIREBALL", "SNOWBALL",
-            case "ENDER_SIGNAL":
+                    "SPLASH_POTION", "THROWN_EXP_BOTTLE", "SPECTRAL_ARROW", "SHULKER_BULLET", "AREA_EFFECT_CLOUD",
-            case "DROPPED_ITEM":
+                    "DRAGON_FIREBALL", "WITHER_SKULL", "MINECART_FURNACE", "LLAMA_SPIT", "TRIDENT", "UNKNOWN" -> {
-            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":
+            case "MINECART_CHEST", "MINECART_HOPPER" -> {
-            case "MINECART_HOPPER":
                 restoreInventory((InventoryHolder) entity);
                 return entity;
+            }
             // START LIVING ENTITY //
             // START AGEABLE //
             // START TAMEABLE //
-            case "HORSE":
+            case "HORSE", "LLAMA", "SKELETON_HORSE", "DONKEY", "MULE" -> {
-            case "LLAMA":
-            case "SKELETON_HORSE":
-            case "DONKEY":
-            case "MULE":
                 AbstractHorse horse = (AbstractHorse) entity;
                 horse.setJumpStrength(this.horse.jump);
                 if (horse instanceof ChestedHorse) {
@@ -586,15 +505,16 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 restoreLiving(horse);
                 restoreInventory(horse);
                 return entity;
+            }
             // END INVENTORY HOLDER //
-            case "WOLF":
+            case "WOLF", "OCELOT" -> {
-            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);
@@ -605,25 +525,22 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 restoreAgeable(sheep);
                 restoreLiving(sheep);
                 return sheep;
-            case "VILLAGER":
+            }
-            case "CHICKEN":
+            case "VILLAGER", "CHICKEN", "COW", "TURTLE", "POLAR_BEAR", "MUSHROOM_COW", "PIG" -> {
-            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) {
@@ -693,56 +610,38 @@ 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 "GHAST":
+            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 "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,7 +24,6 @@ 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;
@@ -47,17 +46,6 @@ 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

@@ -37,6 +37,8 @@ import com.sk89q.worldedit.math.BlockVector2;
 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;
@@ -48,10 +50,14 @@ 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());
@@ -277,6 +283,11 @@ 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 = "TODO")
@@ -287,8 +298,8 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
             if (this.platformGenerator != this) {
                 return this.platformGenerator.generateChunkData(world, random, x, z, biome);
             } else {
-                // Return super as it will throw an exception caught by the server that will mean this method is no longer used.
+                // Throw exception to be caught by the server that indicates the new generation API is being used.
-                return super.generateChunkData(world, random, x, z, biome);
+                throw new UnsupportedOperationException("Using new generation methods. This method is unsupported.");
             }
         }
 
@@ -411,7 +422,8 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
         }
         PlotArea area = UncheckedWorldLocation.at(name, chunkX << 4, 0, chunkZ << 4).getPlotArea();
         if (area == null) {
-            throw new IllegalStateException(String.format("Cannot generate chunk that does not belong to a plot area. World: %s",
+            throw new IllegalStateException(String.format(
+                    "Cannot generate chunk that does not belong to a plot area. World: %s",
                     name
             ));
         }
@@ -428,9 +440,16 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
         private static final List<Biome> BIOMES;
 
         static {
-            ArrayList<Biome> biomes = new ArrayList<>(List.of(Biome.values()));
+            Set<Biome> disabledBiomes = EnumSet.of(Biome.CUSTOM);
-            biomes.remove(Biome.CUSTOM);
+            if (PlotSquared.platform().serverVersion()[1] <= 19) {
-            BIOMES = List.copyOf(biomes);
+                final Biome cherryGrove = Registry.BIOME.get(NamespacedKey.minecraft("cherry_grove"));
+                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,6 +72,7 @@ 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;
@@ -99,6 +100,7 @@ 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;
@@ -740,6 +742,43 @@ 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();

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

@@ -92,7 +92,11 @@ public class BlockEventListener117 implements Listener {
         }
 
         Plot plot = location.getOwnedPlot();
-        if (plot == null && !PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, MiscInteractFlag.class, true) || plot != null && !plot.getFlag(
+        if (plot == null && !PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(
+                area,
+                MiscInteractFlag.class,
+                true
+        ) || plot != null && !plot.getFlag(
                 MiscInteractFlag.class)) {
             if (plotPlayer != null) {
                 if (plot != null) {

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

@@ -234,7 +234,8 @@ public class ChunkListener implements Listener {
         Chunk chunk = event.getChunk();
         if (Settings.Chunk_Processor.AUTO_TRIM) {
             String world = chunk.getWorld().getName();
-            if ((!Settings.Enabled_Components.WORLDS || !SinglePlotArea.isSinglePlotWorld(world)) && this.plotAreaManager.hasPlotArea(world)) {
+            if ((!Settings.Enabled_Components.WORLDS || !SinglePlotArea.isSinglePlotWorld(world)) && this.plotAreaManager.hasPlotArea(
+                    world)) {
                 if (unloadChunk(world, chunk, true)) {
                     return;
                 }

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

@@ -145,54 +145,37 @@ public class EntityEventListener implements Listener {
         }
         CreatureSpawnEvent.SpawnReason reason = event.getSpawnReason();
         switch (reason.toString()) {
-            case "DISPENSE_EGG":
+            case "DISPENSE_EGG", "EGG", "OCELOT_BABY", "SPAWNER_EGG" -> {
-            case "EGG":
-            case "OCELOT_BABY":
-            case "SPAWNER_EGG":
                 if (!area.isSpawnEggs()) {
                     event.setCancelled(true);
                     return;
                 }
-                break;
+            }
-            case "REINFORCEMENTS":
+            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL",
-            case "NATURAL":
+                    "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
-            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":
+            case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER", "CUSTOM" -> {
-            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

@@ -43,10 +43,10 @@ import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
 import com.plotsquared.core.plot.flag.types.BooleanFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
+import com.plotsquared.core.util.PlotFlagUtil;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import com.plotsquared.core.util.PlotFlagUtil;
 import org.bukkit.Chunk;
 import org.bukkit.block.Block;
 import org.bukkit.block.TileState;
@@ -178,59 +178,41 @@ public class PaperListener implements Listener {
         }
         CreatureSpawnEvent.SpawnReason reason = event.getReason();
         switch (reason.toString()) {
-            case "DISPENSE_EGG":
+            case "DISPENSE_EGG", "EGG", "OCELOT_BABY", "SPAWNER_EGG" -> {
-            case "EGG":
-            case "OCELOT_BABY":
-            case "SPAWNER_EGG":
                 if (!area.isSpawnEggs()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
                     return;
                 }
-                break;
+            }
-            case "REINFORCEMENTS":
+            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL", "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.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":
+            case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER", "CUSTOM" -> {
-            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) {
@@ -457,9 +439,11 @@ public class PaperListener implements Listener {
         }
     }
 
-    private boolean getBooleanFlagValue(@NonNull FlagContainer container,
+    private boolean getBooleanFlagValue(
+            @NonNull FlagContainer container,
             @NonNull Class<? extends BooleanFlag<?>> flagClass,
-                                        boolean defaultValue) {
+            boolean defaultValue
+    ) {
         BooleanFlag<?> flag = container.getFlag(flagClass);
         return flag == null ? defaultValue : flag.getValue();
     }

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

@@ -1,93 +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.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,8 +273,7 @@ public class PlayerEventListener implements Listener {
         Plot plot = plotPlayer.getCurrentPlot();
         // Check WorldEdit
         switch (parts[0]) {
-            case "up":
+            case "up", "worldedit:up" -> {
-            case "worldedit:up":
                 if (plot == null || (!plot.isAdded(plotPlayer.getUUID()) && !plotPlayer.hasPermission(
                         Permission.PERMISSION_ADMIN_BUILD_OTHER,
                         true
@@ -283,6 +282,7 @@ public class PlayerEventListener implements Listener {
                     return;
                 }
             }
+        }
         if (plot == null && !area.isRoadFlags()) {
             return;
         }
@@ -572,7 +572,8 @@ public class PlayerEventListener implements Listener {
             if (now == null) {
                 try (final MetaDataAccess<Boolean> kickAccess =
                              pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
-                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
+                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(
+                            false)) {
                         pp.sendMessage(
                                 TranslatableCaption.of("permission.no_permission_event"),
                                 TagResolver.resolver(
@@ -665,7 +666,8 @@ public class PlayerEventListener implements Listener {
             if (plot == null) {
                 try (final MetaDataAccess<Boolean> kickAccess =
                              pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
-                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
+                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(
+                            false)) {
                         pp.sendMessage(
                                 TranslatableCaption.of("permission.no_permission_event"),
                                 TagResolver.resolver(
@@ -1114,13 +1116,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());
@@ -1142,22 +1144,17 @@ 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":
+                    case "REDSTONE", "STRING", "PUMPKIN_SEEDS", "MELON_SEEDS", "COCOA_BEANS", "WHEAT_SEEDS", "BEETROOT_SEEDS",
-                    case "STRING":
+                            "SWEET_BERRIES", "GLOW_BERRIES" -> {
-                    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)) {
                         eventType = PlayerBlockEventType.SPAWN_MOB;
@@ -1189,9 +1186,8 @@ 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.
@@ -1202,11 +1198,11 @@ 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)) {
                 return;

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

@@ -30,9 +30,9 @@ import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.PlotHandler;
 import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
+import com.plotsquared.core.util.PlotFlagUtil;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import com.plotsquared.core.util.PlotFlagUtil;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;

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

@@ -1,63 +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.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/placeholder/MVdWPlaceholders.java

@@ -52,7 +52,7 @@ public class MVdWPlaceholders {
 
     @Subscribe
     public void onNewPlaceholder(final PlaceholderRegistry.@NonNull PlaceholderAddedEvent event) {
-        this.addPlaceholder(event.getPlaceholder());
+        this.addPlaceholder(event.placeholder());
     }
 
     private void addPlaceholder(final @NonNull Placeholder placeholder) {

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

@@ -71,31 +71,11 @@ 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.
      */
-    @Deprecated(forRemoval = true, since = "TODO")
+    BukkitPlayer(
-    public BukkitPlayer(
+            final @NonNull PlotAreaManager plotAreaManager,
-            final @NonNull PlotAreaManager plotAreaManager, final @NonNull EventDispatcher eventDispatcher,
+            final @NonNull EventDispatcher eventDispatcher,
-            final @NonNull Player player, final @NonNull PermissionHandler permissionHandler
+            final @NonNull Player player,
-    ) {
-        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,
             final boolean realPlayer,
             final @NonNull PermissionHandler permissionHandler
     ) {
@@ -196,6 +176,10 @@ 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,7 +54,6 @@ 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);
@@ -66,13 +65,12 @@ 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, this.permissionHandler);
+        return new BukkitPlayer(this.plotAreaManager, this.eventDispatcher, player, false, this.permissionHandler);
     }
 
     @Nullable

Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java

@@ -62,7 +62,6 @@ public class GenChunk extends ZeroedDelegateScopedQueueCoordinator {
     /**
      * @param minY minimum world Y, inclusive
      * @param maxY maximum world Y, inclusive
-     *
      * @since 6.6.0
      */
     public GenChunk(int minY, int maxY) {
@@ -110,9 +109,9 @@ public class GenChunk extends ZeroedDelegateScopedQueueCoordinator {
      */
     public void setChunk(@NonNull ChunkWrapper wrap) {
         chunk = null;
-        world = wrap.world;
+        world = wrap.world();
-        chunkX = wrap.x;
+        chunkX = wrap.x();
-        chunkZ = wrap.z;
+        chunkZ = wrap.z();
     }
 
     @Override

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

@@ -18,6 +18,8 @@
  */
 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;
@@ -28,16 +30,22 @@ 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;
 
@@ -46,20 +54,15 @@ 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 org.bukkit.block.BlockState state = null;
+    public CompoundTag tag;
-    public CompoundTag tag = null;
 
-    /**
+    private boolean paperErrorTextureSent = false;
-     * @deprecated in favour of using WE methods for obtaining NBT, specifically by obtaining a
+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + StateWrapper.class.getSimpleName());
-     *         {@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;
@@ -237,9 +240,8 @@ public class StateWrapper {
                         return true;
                     }
                     String player = skullOwner.getString("Name");
-                    if (player == null || player.isEmpty()) {
+
-                        return false;
+                    if (player != null && !player.isEmpty()) {
-                    }
                         try {
                             skull.setOwningPlayer(Bukkit.getOfflinePlayer(player));
                             skull.update(true);
@@ -248,31 +250,61 @@ public class StateWrapper {
                         }
                         return true;
                     }
-                return false;
-            }
-        }
-        return false;
-    }
 
-    /**
+                    final CompoundTag properties = (CompoundTag) skullOwner.getValue().get("Properties");
-     * Get a CompoundTag of the contents of a block's inventory (chest, furnace, etc.).
+                    if (properties == null) {
-     *
+                        return false;
-     * @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) {
+                    final ListTag textures = properties.getListTag("textures");
-            ItemStack[] contents = inv.getInventory().getContents();
+                    if (textures.getValue().isEmpty()) {
-            Map<String, Tag> values = new HashMap<>();
+                        return false;
-            values.put("Items", new ListTag(CompoundTag.class, serializeInventory(contents)));
-            return new CompoundTag(values);
                     }
+                    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;
+            }
+        }
+        return false;
+    }
 
     public String getId() {
         String tileid = this.tag.getString("id").toLowerCase();

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

@@ -124,7 +124,7 @@ public class BukkitSetupUtils extends SetupUtils {
     public String setupWorld(PlotAreaBuilder builder) {
         this.updateGenerators(false);
         ConfigurationNode[] steps = builder.settingsNodesWrapper() == null ?
-                new ConfigurationNode[0] : builder.settingsNodesWrapper().getSettingsNodes();
+                new ConfigurationNode[0] : builder.settingsNodesWrapper().settingsNodes();
         String world = builder.worldName();
         PlotAreaType type = builder.plotAreaType();
         String worldPath = "worlds." + builder.worldName();

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

@@ -60,4 +60,5 @@ public class TranslationUpdateManager {
             e.printStackTrace();
         }
     }
+
 }

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

@@ -54,7 +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"})
+    // Suppress Json deprecation, we can't use features from gson 2.8.1 and newer yet
     public void updateChecker() {
         task = Bukkit.getScheduler().runTaskTimerAsynchronously(this.javaPlugin, () -> {
             try {

Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SQLiteUUIDService.java

@@ -111,8 +111,8 @@ public class SQLiteUUIDService implements UUIDService, Consumer<List<UUIDMapping
         try (final PreparedStatement statement = getConnection()
                 .prepareStatement("INSERT OR REPLACE INTO `usercache` (`uuid`, `username`) VALUES(?, ?)")) {
             for (final UUIDMapping mapping : uuidWrappers) {
-                statement.setString(1, mapping.getUuid().toString());
+                statement.setString(1, mapping.uuid().toString());
-                statement.setString(2, mapping.getUsername());
+                statement.setString(2, mapping.username());
                 statement.executeUpdate();
             }
         } catch (SQLException e) {

CODE_OF_CONDUCT.md

@@ -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@intellectualsites.com. All
+reported by contacting the project team at contact<at>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.adventure.kyori.net/api/4.12.0/")
+        opt.links("https://jd.advntr.dev/api/4.14.0/")
-        opt.links("https://jd.adventure.kyori.net/text-minimessage/4.12.0/")
+        opt.links("https://jd.advntr.dev/text-minimessage/4.14.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/PlotSquared.java

@@ -270,7 +270,11 @@ public class PlotSquared {
             captionMap = this.captionLoader.loadAll(this.platform.getDirectory().toPath().resolve("lang"));
         } else {
             String fileName = "messages_" + Settings.Enabled_Components.DEFAULT_LOCALE + ".json";
-            captionMap = this.captionLoader.loadOrCreateSingle(this.platform.getDirectory().toPath().resolve("lang").resolve(fileName));
+            captionMap = this.captionLoader.loadOrCreateSingle(this.platform
+                    .getDirectory()
+                    .toPath()
+                    .resolve("lang")
+                    .resolve(fileName));
         }
         this.captionMaps.put(TranslatableCaption.DEFAULT_NAMESPACE, captionMap);
         LOGGER.info(
@@ -1011,7 +1015,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>
      *

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

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

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

@@ -70,7 +70,8 @@ public class Add extends Command {
                 plot.isOwner(player.getUUID()) || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_TRUST),
                 TranslatableCaption.of("permission.no_plot_perms")
         );
-        checkTrue(args.length == 1,
+        checkTrue(
+                args.length == 1,
                 TranslatableCaption.of("commandconfig.command_syntax"),
                 TagResolver.resolver("value", Tag.inserting(Component.text("/plot add <player | *>")))
         );

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

@@ -55,6 +55,7 @@ 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;
@@ -232,10 +233,9 @@ public class Area extends SubCommand {
                 try (final ClipboardWriter clipboardWriter = BuiltInClipboardFormat.SPONGE_SCHEMATIC.getWriter(new FileOutputStream(
                         file))) {
                     final BlockArrayClipboard clipboard = new BlockArrayClipboard(selectedRegion);
-                    final EditSession editSession = WorldEdit
+                    EditSessionBuilder editSessionBuilder = WorldEdit.getInstance().newEditSessionBuilder();
-                            .getInstance()
+                    editSessionBuilder.world(selectedRegion.getWorld());
-                            .getEditSessionFactory()
+                    final EditSession editSession = editSessionBuilder.build();
-                            .getEditSession(selectedRegion.getWorld(), -1);
                     final ForwardExtentCopy forwardExtentCopy =
                             new ForwardExtentCopy(editSession, selectedRegion, clipboard, selectedRegion.getMinimumPoint());
                     forwardExtentCopy.setCopyingBiomes(true);

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

@@ -35,6 +35,7 @@ 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;
@@ -295,10 +296,13 @@ 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 = (sizeX * sizeZ) * cost;
+            cost = size * cost + mergeCost;
             if (cost > 0d) {
                 if (!this.econHandler.isSupported()) {
                     player.sendMessage(TranslatableCaption.of("economy.vault_or_consumer_null"));
@@ -326,7 +330,7 @@ public class Auto extends SubCommand {
         }
 
         List<Plot> plots = this.servicePipeline
-                .pump(new AutoService.AutoQuery(player, null, sizeX, sizeZ, plotarea))
+                .pump(new AutoQuery(player, null, sizeX, sizeZ, plotarea))
                 .through(AutoService.class)
                 .getResult();
 

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

@@ -107,9 +107,7 @@ public class Clear extends Command {
             }
             BackupManager.backup(player, plot, () -> {
                 final long start = System.currentTimeMillis();
-                boolean result = plot.getPlotModificationManager().clear(true, false, player, () -> {
+                boolean result = plot.getPlotModificationManager().clear(true, false, player, () -> TaskManager.runTask(() -> {
-                    plot.getPlotModificationManager().unlink();
-                    TaskManager.runTask(() -> {
                     plot.removeRunning();
                     // If the state changes, then mark it as no longer done
                     if (DoneFlag.isDone(plot)) {
@@ -137,8 +135,7 @@ public class Clear extends Command {
                                     .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
                                     .build()
                     );
-                    });
+                }));
-                });
                 if (!result) {
                     player.sendMessage(TranslatableCaption.of("errors.wait_for_timer"));
                 } else {

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

@@ -46,6 +46,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeoutException;
@@ -77,8 +78,7 @@ public class Cluster extends SubCommand {
         }
         String sub = args[0].toLowerCase();
         switch (sub) {
-            case "l":
+            case "l", "list" -> {
-            case "list": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_LIST)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -133,8 +133,7 @@ public class Cluster extends SubCommand {
                 }
                 return true;
             }
-            case "c":
+            case "c", "create" -> {
-            case "create": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_CREATE)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -269,9 +268,7 @@ public class Cluster extends SubCommand {
                 );
                 return true;
             }
-            case "disband":
+            case "disband", "del", "delete" -> {
-            case "del":
-            case "delete": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_DELETE)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -330,8 +327,7 @@ public class Cluster extends SubCommand {
                 ));
                 return true;
             }
-            case "res":
+            case "res", "resize" -> {
-            case "resize": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_RESIZE)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -452,9 +448,7 @@ public class Cluster extends SubCommand {
                 player.sendMessage(TranslatableCaption.of("cluster.cluster_resized"));
                 return true;
             }
-            case "add":
+            case "add", "inv", "invite" -> {
-            case "inv":
-            case "invite": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_INVITE)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -523,9 +517,7 @@ public class Cluster extends SubCommand {
                         });
                 return true;
             }
-            case "k":
+            case "k", "remove", "kick" -> {
-            case "remove":
-            case "kick": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_KICK)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -605,8 +597,7 @@ public class Cluster extends SubCommand {
                         });
                 return true;
             }
-            case "quit":
+            case "quit", "leave" -> {
-            case "leave": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_LEAVE)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -667,7 +658,7 @@ public class Cluster extends SubCommand {
                 removePlayerPlots(cluster, uuid, player.getLocation().getWorldName());
                 return true;
             }
-            case "members": {
+            case "members" -> {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_HELPERS)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -728,9 +719,7 @@ public class Cluster extends SubCommand {
                         });
                 return true;
             }
-            case "spawn":
+            case "spawn", "home", "tp" -> {
-            case "home":
-            case "tp": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_TP)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -778,10 +767,7 @@ public class Cluster extends SubCommand {
                 player.sendMessage(TranslatableCaption.of("cluster.cluster_teleporting"));
                 return true;
             }
-            case "i":
+            case "i", "info", "show", "information" -> {
-            case "info":
-            case "show":
-            case "information": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_INFO)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
@@ -828,11 +814,7 @@ public class Cluster extends SubCommand {
                                 player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout"));
                             } else {
                                 final String owner;
-                                if (username == null) {
+                                owner = Objects.requireNonNullElse(username, "unknown");
-                                    owner = "unknown";
-                                } else {
-                                    owner = username;
-                                }
                                 String name = cluster.getName();
                                 String size = (cluster.getP2().getX() - cluster.getP1().getX() + 1) + "x" + (
                                         cluster.getP2().getY() - cluster.getP1().getY() + 1);
@@ -850,9 +832,7 @@ public class Cluster extends SubCommand {
                         });
                 return true;
             }
-            case "sh":
+            case "sh", "setspawn", "sethome" -> {
-            case "setspawn":
-            case "sethome": {
                 if (!player.hasPermission(Permission.PERMISSION_CLUSTER_SETHOME)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),

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

@@ -559,9 +559,10 @@ 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);
@@ -580,7 +581,8 @@ 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);
@@ -589,6 +591,7 @@ public abstract class Command {
                 }
             }
         }
+    }
 
     @Override
     public String toString() {

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

@@ -69,7 +69,8 @@ public class Copy extends SubCommand {
 
         plot1.getPlotModificationManager().copy(plot2, player).thenAccept(result -> {
             if (result) {
-                player.sendMessage(TranslatableCaption.of("move.copy_success"),
+                player.sendMessage(
+                        TranslatableCaption.of("move.copy_success"),
                         TagResolver.builder()
                                 .tag("origin", Tag.inserting(Component.text(plot1.toString())))
                                 .tag("target", Tag.inserting(Component.text(plot2.toString())))

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

@@ -75,11 +75,13 @@ 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)))
@@ -87,6 +89,7 @@ public class DebugRoadRegen extends SubCommand {
                 return false;
             }
         }
+    }
 
     public boolean regenPlot(PlotPlayer<?> player) {
         Location location = player.getLocation();

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

@@ -185,8 +185,11 @@ public class Download extends SubCommand {
         if (Settings.Web.LEGACY_WEBINTERFACE) {
             schematicHandler
                     .getCompoundTag(plot)
-                    .whenComplete((compoundTag, throwable) -> {
+                    .whenComplete((compoundTag, throwable) -> schematicHandler.upload(
-                        schematicHandler.upload(compoundTag, null, null, new RunnableVal<>() {
+                            compoundTag,
+                            null,
+                            null,
+                            new RunnableVal<>() {
                                 @Override
                                 public void run(URL value) {
                                     plot.removeRunning();
@@ -199,8 +202,8 @@ public class Download extends SubCommand {
                                     );
                                     player.sendMessage(StaticCaption.of(value.toString()));
                                 }
-                        });
+                            }
-                    });
+                    ));
             return;
         }
         // TODO legacy support

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

@@ -60,9 +60,10 @@ 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]));
@@ -72,7 +73,8 @@ 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]));
@@ -81,8 +83,8 @@ public class Help extends Command {
                     }
                 }
                 return CompletableFuture.completedFuture(false);
-            default:
+            }
-                sendUsage(player);
+            default -> sendUsage(player);
         }
         return CompletableFuture.completedFuture(true);
     }
@@ -132,7 +134,12 @@ public class Help extends Command {
                                 TagResolver.builder()
                                         .tag("command", Tag.inserting(Component.text("/plot help")))
                                         .tag("category", Tag.inserting(Component.text("all")))
-                                        .tag("category_desc", Tag.inserting(TranslatableCaption.of("help.help_display_all_commands").toComponent(player)))
+                                        .tag(
+                                                "category_desc",
+                                                Tag.inserting(TranslatableCaption
+                                                        .of("help.help_display_all_commands")
+                                                        .toComponent(player))
+                                        )
                                         .build()
                         ));
                 builder.append(Component.newline()).append(MINI_MESSAGE.deserialize(TranslatableCaption

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

@@ -85,24 +85,24 @@ public class Inbox extends SubCommand {
         for (int x = page * 12; x < max; x++) {
             PlotComment comment = comments[x];
             Component commentColored;
-            if (player.getName().equals(comment.senderName)) {
+            if (player.getName().equals(comment.senderName())) {
                 commentColored = MINI_MESSAGE
                         .deserialize(
                                 TranslatableCaption.of("list.comment_list_by_lister").getComponent(player),
-                                TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment)))
+                                TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment())))
                         );
             } else {
                 commentColored = MINI_MESSAGE
                         .deserialize(
                                 TranslatableCaption.of("list.comment_list_by_other").getComponent(player),
-                                TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment)))
+                                TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment())))
                         );
             }
             TagResolver resolver = TagResolver.builder()
                     .tag("number", Tag.inserting(Component.text(x)))
-                    .tag("world", Tag.inserting(Component.text(comment.world)))
+                    .tag("world", Tag.inserting(Component.text(comment.world())))
-                    .tag("plot_id", Tag.inserting(Component.text(comment.id.getX() + ";" + comment.id.getY())))
+                    .tag("plot_id", Tag.inserting(Component.text(comment.id().getX() + ";" + comment.id().getY())))
-                    .tag("commenter", Tag.inserting(Component.text(comment.senderName)))
+                    .tag("commenter", Tag.inserting(Component.text(comment.senderName())))
                     .tag("comment", Tag.inserting(commentColored))
                     .build();
             builder.append(MINI_MESSAGE
@@ -137,7 +137,7 @@ public class Inbox extends SubCommand {
                                 int unread = 0;
                                 for (PlotComment comment : value) {
                                     total++;
-                                    if (comment.timestamp > CommentManager
+                                    if (comment.timestamp() > CommentManager
                                             .getTimestamp(player, inbox.toString())) {
                                         unread++;
                                     }
@@ -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,7 +225,6 @@ public class Inbox extends SubCommand {
                         );
                         return false;
                     }
-
                     if (!inbox.getComments(plot, new RunnableVal<>() {
                         @Override
                         public void run(List<PlotComment> value) {
@@ -242,7 +241,7 @@ public class Inbox extends SubCommand {
                             if (success) {
                                 player.sendMessage(
                                         TranslatableCaption.of("comment.comment_removed_success"),
-                                        TagResolver.resolver("value", Tag.inserting(Component.text(comment.comment)))
+                                        TagResolver.resolver("value", Tag.inserting(Component.text(comment.comment())))
                                 );
                             } else {
                                 player.sendMessage(
@@ -254,7 +253,8 @@ 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,7 +268,8 @@ public class Inbox extends SubCommand {
                         plot.getPlotCommentContainer().removeComments(comments);
                     }
                     return true;
-                default:
+                }
+                default -> {
                     try {
                         page = Integer.parseInt(args[1]);
                     } catch (NumberFormatException ignored) {
@@ -276,6 +277,7 @@ public class Inbox extends SubCommand {
                         return false;
                     }
                 }
+            }
         } else {
             page = 1;
         }

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

@@ -52,7 +52,8 @@ public class Info extends SubCommand {
             arg = args[0];
             switch (arg) {
                 // TODO: (re?)implement /plot info inv. (it was never properly implemented)
-                case "trusted", "alias", "biome", "denied", "flags", "id", "size", "members", "creationdate", "seen", "owner", "rating", "likes" -> plot = Plot
+                case "trusted", "alias", "biome", "denied", "flags", "id", "size", "members", "creationdate", "seen", "owner", "rating", "likes" ->
+                        plot = Plot
                                 .getPlotFromString(player, null, false);
                 default -> {
                     plot = Plot.getPlotFromString(player, arg, false);

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

@@ -474,20 +474,20 @@ public class ListCmd extends SubCommand {
                         final List<UUIDMapping> names = PlotSquared.get().getImpromptuUUIDPipeline().getNames(plot.getOwners())
                                 .get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS);
                         for (final UUIDMapping uuidMapping : names) {
-                            PlotPlayer<?> pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuidMapping.getUuid());
+                            PlotPlayer<?> pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuidMapping.uuid());
                             TagResolver resolver = TagResolver.builder()
                                     .tag("prefix", Tag.inserting(Component.text(prefix)))
-                                .tag("player", Tag.inserting(Component.text(uuidMapping.getUsername())))
+                                    .tag("player", Tag.inserting(Component.text(uuidMapping.username())))
                                     .build();
                             if (pp != null) {
                                 builder.append(MINI_MESSAGE.deserialize(online, resolver));
-                            } else if (uuidMapping.getUsername().equalsIgnoreCase("unknown")) {
+                            } else if (uuidMapping.username().equalsIgnoreCase("unknown")) {
                                 TagResolver unknownResolver = TagResolver.resolver(
                                         "info.unknown",
                                         Tag.inserting(TranslatableCaption.of("info.unknown").toComponent(player))
                                 );
                                 builder.append(MINI_MESSAGE.deserialize(unknown, unknownResolver));
-                            } else if (uuidMapping.getUuid().equals(DBFunc.EVERYONE)) {
+                            } else if (uuidMapping.uuid().equals(DBFunc.EVERYONE)) {
                                 TagResolver everyoneResolver = TagResolver.resolver(
                                         "info.everyone",
                                         Tag.inserting(TranslatableCaption.of("info.everyone").toComponent(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_pigstep", "music_disc_5", "music_disc_relic"
             );
 
     private final InventoryUtil inventoryUtil;

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

@@ -90,12 +90,8 @@ public class Purge extends SubCommand {
                 return false;
             }
             switch (split[0].toLowerCase()) {
-                case "world":
+                case "world", "w" -> world = split[1];
-                case "w":
+                case "area", "a" -> {
-                    world = split[1];
-                    break;
-                case "area":
-                case "a":
                     area = this.plotAreaManager.getPlotAreaByString(split[1]);
                     if (area == null) {
                         player.sendMessage(
@@ -104,9 +100,8 @@ public class Purge extends SubCommand {
                         );
                         return false;
                     }
-                    break;
+                }
-                case "plotid":
+                case "plotid", "id" -> {
-                case "id":
                     try {
                         id = PlotId.fromString(split[1]);
                     } catch (IllegalArgumentException ignored) {
@@ -116,9 +111,8 @@ public class Purge extends SubCommand {
                         );
                         return false;
                     }
-                    break;
+                }
-                case "owner":
+                case "owner", "o" -> {
-                case "o":
                     UUIDMapping ownerMapping = PlotSquared.get().getImpromptuUUIDPipeline().getImmediately(split[1]);
                     if (ownerMapping == null) {
                         player.sendMessage(
@@ -127,10 +121,9 @@ public class Purge extends SubCommand {
                         );
                         return false;
                     }
-                    owner = ownerMapping.getUuid();
+                    owner = ownerMapping.uuid();
-                    break;
+                }
-                case "shared":
+                case "shared", "s" -> {
-                case "s":
                     UUIDMapping addedMapping = PlotSquared.get().getImpromptuUUIDPipeline().getImmediately(split[1]);
                     if (addedMapping == null) {
                         player.sendMessage(
@@ -139,25 +132,16 @@ public class Purge extends SubCommand {
                         );
                         return false;
                     }
-                    added = addedMapping.getUuid();
+                    added = addedMapping.uuid();
-                    break;
+                }
-                case "clear":
+                case "clear", "c", "delete", "d", "del" -> clear = Boolean.parseBoolean(split[1]);
-                case "c":
+                case "unknown", "?", "u" -> unknown = Boolean.parseBoolean(split[1]);
-                case "delete":
+                default -> {
-                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<>();
         for (Plot plot : PlotQuery.newQuery().whereBasePlot()) {
             if (world != null && !plot.getWorldName().equalsIgnoreCase(world)) {
@@ -236,9 +220,9 @@ 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());
+                                            () -> LOGGER.info("Plot {} cleared by purge", plot.getId())
-                                    });
+                                    );
                                 } else {
                                     plot.getPlotModificationManager().removeSign();
                                 }

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

@@ -156,9 +156,9 @@ public class Template extends SubCommand {
              ZipOutputStream zos = new ZipOutputStream(fos)) {
 
             for (FileBytes file : files) {
-                ZipEntry ze = new ZipEntry(file.path);
+                ZipEntry ze = new ZipEntry(file.path());
                 zos.putNextEntry(ze);
-                zos.write(file.data);
+                zos.write(file.data());
             }
             zos.closeEntry();
         }

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

@@ -35,34 +35,22 @@ import java.util.Map;
  * the component GUI
  */
 @SerializableAs("preset")
-public class ComponentPreset implements ConfigurationSerializable {
+public record ComponentPreset(
-
+        ClassicPlotManagerComponent component,
-    private final ClassicPlotManagerComponent component;
+        String pattern,
-    private final String pattern;
+        double cost,
-    private final double cost;
+        String permission,
-    private final String permission;
+        String displayName,
-    private final String displayName;
+        List<String> description,
-    private final List<String> description;
+        ItemType icon
-    private final ItemType icon;
+) implements ConfigurationSerializable {
-
-    public ComponentPreset(
-            ClassicPlotManagerComponent component, String pattern, double cost,
-            String permission, String displayName, List<String> description, final ItemType icon
-    ) {
-        this.component = component;
-        this.pattern = pattern;
-        this.cost = cost;
-        this.permission = permission;
-        this.displayName = displayName;
-        this.description = description;
-        this.icon = icon;
-    }
 
     @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 needs a valid target component"));
+                        new IllegalArgumentException("The preset in components.yml needs a valid target component, got: " + map.get(
+                                "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();
@@ -74,34 +62,6 @@ public class ComponentPreset implements ConfigurationSerializable {
         );
     }
 
-    public ClassicPlotManagerComponent getComponent() {
-        return this.component;
-    }
-
-    public String getPattern() {
-        return this.pattern;
-    }
-
-    public double getCost() {
-        return this.cost;
-    }
-
-    public String getPermission() {
-        return this.permission;
-    }
-
-    public String getDisplayName() {
-        return this.displayName;
-    }
-
-    public List<String> getDescription() {
-        return this.description;
-    }
-
-    public ItemType getIcon() {
-        return this.icon;
-    }
-
     @Override
     public Map<String, Object> serialize() {
         final Map<String, Object> map = new HashMap<>();

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

@@ -165,8 +165,8 @@ public class ComponentPresetManager {
 
         final List<ComponentPreset> allowedPresets = new ArrayList<>(this.presets.size());
         for (final ComponentPreset componentPreset : this.presets) {
-            if (!componentPreset.getPermission().isEmpty() && !player.hasPermission(
+            if (!componentPreset.permission().isEmpty() && !player.hasPermission(
-                    componentPreset.getPermission()
+                    componentPreset.permission()
             )) {
                 continue;
             }
@@ -200,30 +200,30 @@ public class ComponentPresetManager {
                     return false;
                 }
 
-                final Pattern pattern = PatternUtil.parse(null, componentPreset.getPattern(), false);
+                final Pattern pattern = PatternUtil.parse(null, componentPreset.pattern(), false);
                 if (pattern == null) {
                     getPlayer().sendMessage(TranslatableCaption.of("preset.preset_invalid"));
                     return false;
                 }
 
-                if (componentPreset.getCost() > 0.0D) {
+                if (componentPreset.cost() > 0.0D) {
                     if (!econHandler.isEnabled(plot.getArea())) {
                         getPlayer().sendMessage(
                                 TranslatableCaption.of("preset.economy_disabled"),
-                                TagResolver.resolver("preset", Tag.inserting(Component.text(componentPreset.getDisplayName())))
+                                TagResolver.resolver("preset", Tag.inserting(Component.text(componentPreset.displayName())))
                         );
                         return false;
                     }
-                    if (econHandler.getMoney(getPlayer()) < componentPreset.getCost()) {
+                    if (econHandler.getMoney(getPlayer()) < componentPreset.cost()) {
                         getPlayer().sendMessage(TranslatableCaption.of("preset.preset_cannot_afford"));
                         return false;
                     } else {
-                        econHandler.withdrawMoney(getPlayer(), componentPreset.getCost());
+                        econHandler.withdrawMoney(getPlayer(), componentPreset.cost());
                         getPlayer().sendMessage(
                                 TranslatableCaption.of("economy.removed_balance"),
                                 TagResolver.resolver(
                                         "money",
-                                        Tag.inserting(Component.text(econHandler.format(componentPreset.getCost())))
+                                        Tag.inserting(Component.text(econHandler.format(componentPreset.cost())))
                                 )
                         );
                     }
@@ -235,7 +235,7 @@ public class ComponentPresetManager {
                     queue.setCompleteTask(plot::removeRunning);
                     for (Plot current : plot.getConnectedPlots()) {
                         current.getPlotModificationManager().setComponent(
-                                componentPreset.getComponent().name(),
+                                componentPreset.component().name(),
                                 pattern,
                                 player,
                                 queue
@@ -252,32 +252,32 @@ public class ComponentPresetManager {
         for (int i = 0; i < allowedPresets.size(); i++) {
             final ComponentPreset preset = allowedPresets.get(i);
             final List<String> lore = new ArrayList<>();
-            if (preset.getCost() > 0) {
+            if (preset.cost() > 0) {
                 if (!this.econHandler.isEnabled(plot.getArea())) {
                     lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.deserialize(
                             TranslatableCaption.of("preset.preset_lore_economy_disabled").getComponent(player))));
                 } else {
                     lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.deserialize(
                             TranslatableCaption.of("preset.preset_lore_cost").getComponent(player),
-                            TagResolver.resolver("cost", Tag.inserting(Component.text(String.format("%.2f", preset.getCost()))))
+                            TagResolver.resolver("cost", Tag.inserting(Component.text(String.format("%.2f", preset.cost()))))
                     )));
                 }
             }
             lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.deserialize(
                     TranslatableCaption.of("preset.preset_lore_component").getComponent(player),
                     TagResolver.builder()
-                            .tag("component", Tag.inserting(Component.text(preset.getComponent().name().toLowerCase())))
+                            .tag("component", Tag.inserting(Component.text(preset.component().name().toLowerCase())))
                             .tag("prefix", Tag.inserting(TranslatableCaption.of("core.prefix").toComponent(player)))
                             .build()
             )));
             lore.removeIf(String::isEmpty);
-            lore.addAll(preset.getDescription());
+            lore.addAll(preset.description());
             plotInventory.setItem(
                     i,
                     new PlotItemStack(
-                            preset.getIcon().getId().replace("minecraft:", ""),
+                            preset.icon().getId().replace("minecraft:", ""),
                             1,
-                            preset.getDisplayName(),
+                            preset.displayName(),
                             lore.toArray(new String[0])
                     )
             );

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

@@ -42,32 +42,6 @@ public class Config {
 
     private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Config.class.getSimpleName());
 
-    /**
-     * Get the value for a node<br>
-     * Probably throws some error if you try to get a non existent key
-     *
-     * @param key  configuration key
-     * @param root configuration class
-     * @param <T>  value type
-     * @return value
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> T get(String key, Class<?> root) {
-        String[] split = key.split("\\.");
-        Object instance = getInstance(split, root);
-        if (instance != null) {
-            Field field = getField(split, instance);
-            if (field != null) {
-                try {
-                    return (T) field.get(instance);
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return null;
-    }
-
     /**
      * Set the value of a specific node<br>
      * Probably throws some error if you supply non existing keys or invalid values
@@ -259,7 +233,6 @@ public class Config {
      *
      * @param split    the node (split by period)
      * @param instance the instance
-     * @return
      */
     private static Field getField(String[] split, Object instance) {
         try {
@@ -445,10 +418,6 @@ public class Config {
             return INSTANCES.values();
         }
 
-        public Collection<String> getSections() {
-            return INSTANCES.keySet();
-        }
-
         private Map<String, T> getRaw() {
             return INSTANCES;
         }

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

@@ -56,7 +56,8 @@ final class ClassLoaderCaptionProvider implements DefaultCaptionProvider {
                 LOGGER.info("No resource for locale '{}' found in the plugin file." +
                                 "Please ensure you have placed the latest version of the file messages_{}.json in the 'lang' folder." +
                                 "You may be able to find completed translations at https://intellectualsites.crowdin.com/plotsquared",
-                        locale, locale);
+                        locale, locale
+                );
                 return null;
             }
             try (final BufferedReader reader = new BufferedReader(new InputStreamReader(stream))) {

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

@@ -19,6 +19,7 @@
 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;
@@ -30,6 +31,7 @@ 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,6 +21,7 @@ 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;
 
@@ -30,6 +31,7 @@ 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

@@ -2400,13 +2400,13 @@ public class SQLManager implements AbstractDB {
                 if (plot != null) {
                     statement.setString(1, plot.getArea().toString());
                     statement.setInt(2, plot.getId().hashCode());
-                    statement.setString(3, comment.comment);
+                    statement.setString(3, comment.comment());
-                    statement.setString(4, comment.inbox);
+                    statement.setString(4, comment.inbox());
-                    statement.setString(5, comment.senderName);
+                    statement.setString(5, comment.senderName());
                 } else {
-                    statement.setString(1, comment.comment);
+                    statement.setString(1, comment.comment());
-                    statement.setString(2, comment.inbox);
+                    statement.setString(2, comment.inbox());
-                    statement.setString(3, comment.senderName);
+                    statement.setString(3, comment.senderName());
                 }
             }
 
@@ -2518,10 +2518,10 @@ public class SQLManager implements AbstractDB {
             public void set(PreparedStatement statement) throws SQLException {
                 statement.setString(1, plot.getArea().toString());
                 statement.setInt(2, plot.getId().hashCode());
-                statement.setString(3, comment.comment);
+                statement.setString(3, comment.comment());
-                statement.setString(4, comment.inbox);
+                statement.setString(4, comment.inbox());
-                statement.setInt(5, (int) (comment.timestamp / 1000));
+                statement.setInt(5, (int) (comment.timestamp() / 1000));
-                statement.setString(6, comment.senderName);
+                statement.setString(6, comment.senderName());
             }
 
             @Override
@@ -3414,15 +3414,10 @@ public class SQLManager implements AbstractDB {
         }
     }
 
-    private static class LegacySettings {
+    private record LegacySettings(
-
+            int id,
-        public final int id;
+            PlotSettings settings
-        public final PlotSettings settings;
+    ) {
-
-        public LegacySettings(int id, PlotSettings settings) {
-            this.id = id;
-            this.settings = settings;
-        }
 
     }
 

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

@@ -0,0 +1,64 @@
+/*
+ * 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,38 +105,6 @@ 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

@@ -0,0 +1,50 @@
+/*
+ * 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,10 +379,11 @@ 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 = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }
@@ -390,7 +391,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 = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }
@@ -398,7 +399,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 = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }
@@ -406,7 +407,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 = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }

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

@@ -38,6 +38,7 @@ import javax.annotation.Nullable;
 
 @SuppressWarnings("WeakerAccess")
 public abstract class ClassicPlotWorld extends SquarePlotWorld {
+
     private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + ClassicPlotWorld.class.getSimpleName());
 
     public int ROAD_HEIGHT = 62;
@@ -64,6 +65,21 @@ 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.
      *
@@ -144,19 +160,4 @@ 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

@@ -341,7 +341,10 @@ public class HybridGen extends IndependentPlotGenerator {
                 for (Entity entity : hybridPlotWorld.getPlotSchematicEntities()) {
                     if (region.contains(entity.getLocation().toVector().toBlockPoint())) {
                         Vector3 pos = (entity.getLocation().toVector()
-                                .subtract(region.getMinimumPoint().withY(hybridPlotWorld.getPlotSchematicMinPoint().getY()).toVector3()))
+                                .subtract(region
+                                        .getMinimumPoint()
+                                        .withY(hybridPlotWorld.getPlotSchematicMinPoint().getY())
+                                        .toVector3()))
                                 .add(min.getBlockVector3().withY(hybridPlotWorld.SCHEM_Y).toVector3());
                         result.setEntity(new PopulatingEntity(
                                 entity,
@@ -399,6 +402,12 @@ 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.
@@ -453,10 +462,4 @@ public class HybridGen extends IndependentPlotGenerator {
 
     }
 
-    private enum SchematicFeature {
-        BIOMES,
-        ROAD,
-        POPULATING
-    }
-
 }

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

@@ -141,7 +141,11 @@ public class HybridPlotManager extends ClassicPlotManager {
                         (pos1.getX() + pos2.getX()) / 2,
                         (pos1.getZ() + pos2.getZ()) / 2
                 ), biome)) {
-            WorldUtil.setBiome(hybridPlotWorld.getWorldName(), new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3()), biome);
+            WorldUtil.setBiome(
+                    hybridPlotWorld.getWorldName(),
+                    new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3()),
+                    biome
+            );
         }
     }
 
@@ -203,8 +207,18 @@ public class HybridPlotManager extends ClassicPlotManager {
         PlotId id2 = PlotId.of(id.getX(), id.getY() + 1);
         Location bot = getPlotBottomLocAbs(id2);
         Location top = getPlotTopLocAbs(id);
-        Location pos1 = Location.at(hybridPlotWorld.getWorldName(), bot.getX() - 1, hybridPlotWorld.getMinGenHeight(), top.getZ() + 1);
+        Location pos1 = Location.at(
-        Location pos2 = Location.at(hybridPlotWorld.getWorldName(), top.getX() + 1, hybridPlotWorld.getMaxGenHeight(), bot.getZ());
+                hybridPlotWorld.getWorldName(),
+                bot.getX() - 1,
+                hybridPlotWorld.getMinGenHeight(),
+                top.getZ() + 1
+        );
+        Location pos2 = Location.at(
+                hybridPlotWorld.getWorldName(),
+                top.getX() + 1,
+                hybridPlotWorld.getMaxGenHeight(),
+                bot.getZ()
+        );
         this.resetBiome(hybridPlotWorld, pos1, pos2);
         if (!hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
             return true;
@@ -274,6 +288,13 @@ 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()),
@@ -291,6 +312,13 @@ 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,8 +68,6 @@ 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;
@@ -104,22 +102,6 @@ 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();
@@ -341,7 +323,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
             short w3 = (short) d3.getX();
             short l3 = (short) d3.getZ();
             short h3 = (short) d3.getY();
-            if (w3 > PLOT_WIDTH || h3 > PLOT_WIDTH) {
+            if (w3 > PLOT_WIDTH || l3 > PLOT_WIDTH) {
                 this.ROAD_SCHEMATIC_ENABLED = true;
             }
             int centerShiftZ;
@@ -396,7 +378,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         }
         if ((schematic1 == null && schematic2 == null) || this.ROAD_WIDTH == 0) {
             if (Settings.DEBUG) {
-                LOGGER.info("- schematic: false");
+                LOGGER.info("- road schematic: false");
             }
             return;
         }
@@ -486,11 +468,7 @@ 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) {
@@ -521,11 +499,7 @@ 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) {
@@ -570,14 +544,6 @@ 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()}

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

@@ -63,7 +63,6 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 import java.io.File;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -380,22 +379,6 @@ public class HybridUtils {
         run.run();
     }
 
-    public int checkModified(QueueCoordinator queue, int x1, int x2, int y1, int y2, int z1, int z2, BlockState[] blocks) {
-        int count = 0;
-        for (int y = y1; y <= y2; y++) {
-            for (int x = x1; x <= x2; x++) {
-                for (int z = z1; z <= z2; z++) {
-                    BlockState block = queue.getBlock(x, y, z);
-                    boolean same = Arrays.stream(blocks).anyMatch(p -> this.worldUtil.isBlockSame(block, p));
-                    if (!same) {
-                        count++;
-                    }
-                }
-            }
-        }
-        return count;
-    }
-
     public final ArrayList<BlockVector2> getChunks(BlockVector2 region) {
         ArrayList<BlockVector2> chunks = new ArrayList<>();
         int sx = region.getX() << 5;

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

@@ -57,7 +57,8 @@ public abstract class IndependentPlotGenerator {
      * @param setting PlotArea (settings)
      * @since TODO
      */
-    public void populateChunk(ZeroedDelegateScopedQueueCoordinator result, PlotArea setting) {}
+    public void populateChunk(ZeroedDelegateScopedQueueCoordinator result, PlotArea setting) {
+    }
 
     /**
      * Return a new PlotArea object.

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

@@ -185,31 +185,39 @@ 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

@@ -142,7 +142,9 @@ public class PlotListener {
                     Map.Entry<UUID, List<StatusEffect>> entry = iterator.next();
                     List<StatusEffect> effects = entry.getValue();
                     effects.removeIf(effect -> currentTime > effect.expiresAt);
-                    if (effects.isEmpty()) iterator.remove();
+                    if (effects.isEmpty()) {
+                        iterator.remove();
+                    }
                 }
             }
         }, TaskTime.seconds(1L));
@@ -341,14 +343,14 @@ public class PlotListener {
             }
 
             TimedFlag.Timed<Integer> feed = plot.getFlag(FeedFlag.class);
-            if (feed.getInterval() != 0 && feed.getValue() != 0) {
+            if (feed.interval() != 0 && feed.value() != 0) {
                 feedRunnable
-                        .put(player.getUUID(), new Interval(feed.getInterval(), feed.getValue(), 20));
+                        .put(player.getUUID(), new Interval(feed.interval(), feed.value(), 20));
             }
             TimedFlag.Timed<Integer> heal = plot.getFlag(HealFlag.class);
-            if (heal.getInterval() != 0 && heal.getValue() != 0) {
+            if (heal.interval() != 0 && heal.value() != 0) {
                 healRunnable
-                        .put(player.getUUID(), new Interval(heal.getInterval(), heal.getValue(), 20));
+                        .put(player.getUUID(), new Interval(heal.interval(), heal.value(), 20));
             }
             return true;
         }
@@ -486,6 +488,7 @@ public class PlotListener {
 
     /**
      * Marks an effect as a status effect that will be removed on leaving a plot
+     *
      * @param uuid      The uuid of the player the effect belongs to
      * @param name      The name of the status effect
      * @param expiresAt The time when the effect expires

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

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

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

@@ -51,7 +51,6 @@ public final class UncheckedWorldLocation extends Location {
      * @param y     Y coordinate
      * @param z     Z coordinate
      * @return New location
-     *
      * @since 6.9.0
      */
     @DoNotUse

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

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

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

@@ -20,7 +20,6 @@ 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;
@@ -2418,7 +2417,6 @@ 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

@@ -658,8 +658,10 @@ public abstract class PlotArea implements ComponentLike {
                     TranslatableCaption.of("height.height_limit"),
                     TagResolver.builder()
                             .tag("minHeight", Tag.inserting(Component.text(minBuildHeight)))
-                            .tag("maxHeight",
+                            .tag(
-                            Tag.inserting(Component.text(maxBuildHeight))).build()
+                                    "maxHeight",
+                                    Tag.inserting(Component.text(maxBuildHeight))
+                            ).build()
             );
             // Return true if "failed" as the method will always be inverted otherwise
             return true;

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

@@ -106,17 +106,6 @@ 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,17 +222,6 @@ 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
@@ -283,7 +272,21 @@ public final class PlotModificationManager {
                 manager.clearPlot(current, this, actor, null);
             }
         };
+        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) {
+            if (this.unlinkPlot(event.isCreateRoad(), event.isCreateSign(), run)) {
+                PlotSquared.get().getEventDispatcher().callPostUnlink(plot, event.getReason());
+            }
+        } else {
             run.run();
+        }
         return true;
     }
 
@@ -323,7 +326,23 @@ 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();
@@ -368,14 +387,17 @@ 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);
         }
-        if (queue != null) {
         queue.enqueue();
-        }
         return true;
     }
 

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

@@ -79,14 +79,6 @@ public class PlotSettings {
         this.ratings = ratings;
     }
 
-    public boolean setMerged(int direction, boolean merged) {
-        if (this.merged[direction] != merged) {
-            this.merged[direction] = merged;
-            return true;
-        }
-        return false;
-    }
-
     public boolean setMerged(Direction direction, boolean merged) {
         if (Direction.ALL == direction) {
             throw new IllegalArgumentException("You cannot use Direction.ALL in this method!");
@@ -113,13 +105,12 @@ public class PlotSettings {
         this.position = position;
     }
 
-    @SuppressWarnings({"UnstableApiUsage"})
     public List<PlotComment> getComments(String inbox) {
         if (this.comments == null) {
             return Collections.emptyList();
         }
 
-        return this.comments.stream().filter(comment -> comment.inbox.equals(inbox))
+        return this.comments.stream().filter(comment -> comment.inbox().equals(inbox))
                 .collect(ImmutableList.toImmutableList());
     }
 

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

@@ -58,7 +58,7 @@ public class CommentManager {
                         if (value != null) {
                             int num = 0;
                             for (PlotComment comment : value) {
-                                if (comment.timestamp > getTimestamp(player, inbox.toString())) {
+                                if (comment.timestamp() > getTimestamp(player, inbox.toString())) {
                                     num++;
                                 }
                             }

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

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

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

@@ -19,7 +19,6 @@
 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;
@@ -63,11 +62,6 @@ 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/expiration/ExpiryTask.java

@@ -154,6 +154,7 @@ public class ExpiryTask {
 
     /**
      * Returns {@code true} if this task respects unknown owners
+     *
      * @return {@code true} if unknown owners should be counted as never online
      * @since 6.4.0
      */

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

@@ -57,25 +57,16 @@ public class DenyTeleportFlag extends PlotFlag<DenyTeleportFlag.DeniedGroup, Den
         }
         final boolean result;
         switch (value) {
-            case TRUSTED:
+            case TRUSTED -> result = !plot.getTrusted().contains(player.getUUID());
-                result = !plot.getTrusted().contains(player.getUUID());
+            case MEMBERS -> result = !plot.getMembers().contains(player.getUUID());
-                break;
+            case NONMEMBERS -> result = plot.isAdded(player.getUUID());
-            case MEMBERS:
+            case NONTRUSTED -> result =
-                result = !plot.getMembers().contains(player.getUUID());
-                break;
-            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());
-            case NONOWNERS:
+            default -> {
-                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/FeedFlag.java

@@ -60,7 +60,7 @@ public class FeedFlag extends TimedFlag<Integer, FeedFlag> {
 
     @Override
     protected Integer mergeValue(Integer other) {
-        return this.getValue().getValue() + other;
+        return this.getValue().value() + other;
     }
 
     @Override

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

@@ -68,14 +68,11 @@ public class FlyFlag extends PlotFlag<FlyFlag.FlyStatus, FlyFlag> {
 
     @Override
     protected FlyFlag flagOf(final @NonNull FlyStatus value) {
-        switch (value) {
+        return switch (value) {
-            case ENABLED:
+            case ENABLED -> FLIGHT_FLAG_ENABLED;
-                return FLIGHT_FLAG_ENABLED;
+            case DISABLED -> FLIGHT_FLAG_DISABLED;
-            case DISABLED:
+            default -> FLIGHT_FLAG_DEFAULT;
-                return FLIGHT_FLAG_DISABLED;
+        };
-            default:
-                return FLIGHT_FLAG_DEFAULT;
-        }
     }
 
     @Override

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

@@ -60,7 +60,7 @@ public class HealFlag extends TimedFlag<Integer, HealFlag> {
 
     @Override
     protected Integer mergeValue(Integer other) {
-        return this.getValue().getValue() + other;
+        return this.getValue().value() + other;
     }
 
     @Override

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

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

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

@@ -76,6 +76,7 @@ public class SinglePlotArea extends GridPlotWorld {
      * Returns true if the given string matches the naming system used to identify single plot worlds
      * e.g. -1_5 represents plot id *;-1;5. "*" being the plot area name given to single plot world
      * {@link com.plotsquared.core.plot.PlotArea}.
+     *
      * @since 6.1.4
      */
     public static boolean isSinglePlotWorld(String worldName) {

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

@@ -36,7 +36,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
  * The min and max points of this queue are offset according to the minimum point given in the constructor, and the offsets set
  * in {@link BlockArrayCacheScopedQueueCoordinator#setOffsetX(int)} and
  * {@link BlockArrayCacheScopedQueueCoordinator#setOffsetZ(int)}
- *
+ * <p>
  * Internal use only. Subject to change at any time and created for specific use cases.
  */
 @NotPublic
@@ -54,6 +54,7 @@ public class BlockArrayCacheScopedQueueCoordinator extends ZeroedDelegateScopedQ
     private final int scopeMaxZ;
     private int offsetX = 0;
     private int offsetZ = 0;
+
     /**
      * Construct a new instance
      *

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

@@ -29,6 +29,7 @@ public abstract class ChunkCoordinator implements Runnable {
 
     /**
      * Cancel the chunk coordinator.
+     *
      * @since 6.0.10
      */
     public abstract void cancel();

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

@@ -43,11 +43,10 @@ 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;
@@ -203,7 +202,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.
+     *         Scheduled for removal once we drop the support for versions not supporting 3D biomes, 1.18 and earlier.
      */
     @Deprecated(forRemoval = true, since = "6.0.0")
     public abstract boolean setBiome(int x, int z, @NonNull BiomeType biome);

Core/src/main/java/com/plotsquared/core/queue/subscriber/DefaultProgressSubscriber.java

@@ -36,6 +36,7 @@ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import javax.annotation.Nullable;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -92,11 +93,7 @@ public class DefaultProgressSubscriber implements ProgressSubscriber {
         this.actor = actor;
         this.interval = TaskTime.ms(interval);
         this.wait = TaskTime.ms(wait);
-        if (caption == null) {
+        this.caption = Objects.requireNonNullElseGet(caption, () -> TranslatableCaption.of("working.progress"));
-            this.caption = TranslatableCaption.of("working.progress");
-        } else {
-            this.caption = caption;
-        }
     }
 
     @Override

Core/src/main/java/com/plotsquared/core/services/plots/AutoQuery.java

@@ -0,0 +1,94 @@
+/*
+ * 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.services.plots;
+
+import com.plotsquared.core.player.PlotPlayer;
+import com.plotsquared.core.plot.PlotArea;
+import com.plotsquared.core.plot.PlotId;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+/**
+ * Crate a new auto query
+ *
+ * @param player   Player to claim for
+ * @param startId  Plot ID to start searching from
+ * @param sizeX    Number of plots along the X axis
+ * @param sizeZ    Number of plots along the Z axis
+ * @param plotArea Plot area to search in
+ */
+public record AutoQuery(
+        @NonNull PlotPlayer<?> player,
+        @Nullable PlotId startId,
+        int sizeX,
+        int sizeZ,
+        @NonNull PlotArea plotArea
+) {
+
+    /**
+     * Get the player that the plots are meant for
+     *
+     * @return Player
+     */
+    @Override
+    public @NonNull PlotPlayer<?> player() {
+        return this.player;
+    }
+
+    /**
+     * Get the plot ID to start searching from
+     *
+     * @return Start ID
+     */
+    @Override
+    public @Nullable PlotId startId() {
+        return this.startId;
+    }
+
+    /**
+     * Get the number of plots along the X axis
+     *
+     * @return Number of plots along the X axis
+     */
+    @Override
+    public int sizeX() {
+        return this.sizeX;
+    }
+
+    /**
+     * Get the number of plots along the Z axis
+     *
+     * @return Number of plots along the Z axis
+     */
+    @Override
+    public int sizeZ() {
+        return this.sizeZ;
+    }
+
+    /**
+     * Get the plot area to search in
+     *
+     * @return Plot area
+     */
+    @Override
+    public @NonNull PlotArea plotArea() {
+        return this.plotArea;
+    }
+
+}

Core/src/main/java/com/plotsquared/core/services/plots/AutoService.java

@@ -21,9 +21,7 @@ package com.plotsquared.core.services.plots;
 import cloud.commandframework.services.types.Service;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
-import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.PlotAreaType;
 import com.plotsquared.core.plot.PlotId;
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -34,88 +32,12 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 
-public interface AutoService extends Service<AutoService.AutoQuery, List<Plot>> {
+public interface AutoService extends Service<AutoQuery, List<Plot>> {
 
     Cache<PlotId, Plot> plotCandidateCache = CacheBuilder.newBuilder()
             .expireAfterWrite(20, TimeUnit.SECONDS).build();
     Object plotLock = new Object();
 
-    final class AutoQuery {
-
-        private final PlotPlayer<?> player;
-        private final PlotId startId;
-        private final int sizeX;
-        private final int sizeZ;
-        private final PlotArea plotArea;
-
-        /**
-         * Crate a new auto query
-         *
-         * @param player   Player to claim for
-         * @param startId  Plot ID to start searching from
-         * @param sizeX    Number of plots along the X axis
-         * @param sizeZ    Number of plots along the Z axis
-         * @param plotArea Plot area to search in
-         */
-        public AutoQuery(
-                final @NonNull PlotPlayer<?> player, final @Nullable PlotId startId,
-                final int sizeX, final int sizeZ, final @NonNull PlotArea plotArea
-        ) {
-            this.player = player;
-            this.startId = startId;
-            this.sizeX = sizeX;
-            this.sizeZ = sizeZ;
-            this.plotArea = plotArea;
-        }
-
-        /**
-         * Get the player that the plots are meant for
-         *
-         * @return Player
-         */
-        public @NonNull PlotPlayer<?> getPlayer() {
-            return this.player;
-        }
-
-        /**
-         * Get the plot ID to start searching from
-         *
-         * @return Start ID
-         */
-        public @Nullable PlotId getStartId() {
-            return this.startId;
-        }
-
-        /**
-         * Get the number of plots along the X axis
-         *
-         * @return Number of plots along the X axis
-         */
-        public int getSizeX() {
-            return this.sizeX;
-        }
-
-        /**
-         * Get the number of plots along the Z axis
-         *
-         * @return Number of plots along the Z axis
-         */
-        public int getSizeZ() {
-            return this.sizeZ;
-        }
-
-        /**
-         * Get the plot area to search in
-         *
-         * @return Plot area
-         */
-        public @NonNull PlotArea getPlotArea() {
-            return this.plotArea;
-        }
-
-    }
-
-
     final class DefaultAutoService implements AutoService {
 
         @Override
@@ -125,17 +47,16 @@ public interface AutoService extends Service<AutoService.AutoQuery, List<Plot>>
 
     }
 
-
     final class SinglePlotService implements AutoService, Predicate<AutoQuery> {
 
         @Nullable
         @Override
         public List<Plot> handle(@NonNull AutoQuery autoQuery) {
             Plot plot;
-            PlotId nextId = autoQuery.getStartId();
+            PlotId nextId = autoQuery.startId();
             do {
                 synchronized (plotLock) {
-                    plot = autoQuery.getPlotArea().getNextFreePlot(autoQuery.getPlayer(), nextId);
+                    plot = autoQuery.plotArea().getNextFreePlot(autoQuery.player(), nextId);
                     if (plot != null && plotCandidateCache.getIfPresent(plot.getId()) == null) {
                         plotCandidateCache.put(plot.getId(), plot);
                         return Collections.singletonList(plot);
@@ -151,12 +72,11 @@ public interface AutoService extends Service<AutoService.AutoQuery, List<Plot>>
 
         @Override
         public boolean test(final @NonNull AutoQuery autoQuery) {
-            return autoQuery.sizeX == 1 && autoQuery.sizeZ == 1;
+            return autoQuery.sizeX() == 1 && autoQuery.sizeZ() == 1;
         }
 
     }
 
-
     final class MultiPlotService implements AutoService, Predicate<AutoQuery> {
 
         @Override
@@ -166,14 +86,14 @@ public interface AutoService extends Service<AutoService.AutoQuery, List<Plot>>
             while (true) {
                 synchronized (plotLock) {
                     final PlotId start =
-                            autoQuery.getPlotArea().getMeta("lastPlot", PlotId.of(0, 0)).getNextId();
+                            autoQuery.plotArea().getMeta("lastPlot", PlotId.of(0, 0)).getNextId();
                     final PlotId end = PlotId.of(
-                            start.getX() + autoQuery.getSizeX() - 1,
+                            start.getX() + autoQuery.sizeX() - 1,
-                            start.getY() + autoQuery.getSizeZ() - 1
+                            start.getY() + autoQuery.sizeZ() - 1
                     );
                     final List<Plot> plots =
-                            autoQuery.getPlotArea().canClaim(autoQuery.getPlayer(), start, end);
+                            autoQuery.plotArea().canClaim(autoQuery.player(), start, end);
-                    autoQuery.getPlotArea().setMeta("lastPlot", start); // set entry point for next try
+                    autoQuery.plotArea().setMeta("lastPlot", start); // set entry point for next try
                     if (plots != null && !plots.isEmpty()) {
                         for (final Plot plot : plots) {
                             if (plotCandidateCache.getIfPresent(plot.getId()) != null) {
@@ -189,7 +109,7 @@ public interface AutoService extends Service<AutoService.AutoQuery, List<Plot>>
 
         @Override
         public boolean test(final @NonNull AutoQuery autoQuery) {
-            return autoQuery.getPlotArea().getType() != PlotAreaType.PARTIAL;
+            return autoQuery.plotArea().getType() != PlotAreaType.PARTIAL;
         }
 
     }

Core/src/main/java/com/plotsquared/core/setup/PlotAreaBuilder.java

@@ -25,11 +25,17 @@ import com.plotsquared.core.plot.PlotAreaTerrainType;
 import com.plotsquared.core.plot.PlotAreaType;
 import com.plotsquared.core.plot.PlotId;
 import com.plotsquared.core.util.SetupUtils;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
 
 public class PlotAreaBuilder {
 
     private String generatorName;
     private String plotManager;
+    @Nullable
     private PlotAreaType plotAreaType;
     private PlotAreaTerrainType terrainType;
     private String worldName;
@@ -85,8 +91,10 @@ public class PlotAreaBuilder {
         return this.plotManager;
     }
 
+    @NotNull
+    @Contract(" -> !null")
     public PlotAreaType plotAreaType() {
-        return this.plotAreaType;
+        return Objects.requireNonNullElse(this.plotAreaType, PlotAreaType.NORMAL);
     }
 
     public PlotAreaTerrainType terrainType() {
@@ -127,7 +135,8 @@ public class PlotAreaBuilder {
         return this;
     }
 
-    public PlotAreaBuilder plotAreaType(PlotAreaType plotAreaType) {
+    public PlotAreaBuilder plotAreaType(@NotNull PlotAreaType plotAreaType) {
+        Objects.requireNonNull(plotAreaType, "PlotAreaType must not be null");
         this.plotAreaType = plotAreaType;
         return this;
     }

Core/src/main/java/com/plotsquared/core/setup/SettingsNodeStep.java

@@ -48,10 +48,10 @@ public class SettingsNodeStep implements SetupStep {
     ) {
         this.configurationNode = configurationNode;
         this.id = id;
-        if (wrapper.getSettingsNodes().length > id + 1) {
+        if (wrapper.settingsNodes().length > id + 1) {
-            this.next = new SettingsNodeStep(wrapper.getSettingsNodes()[id + 1], id + 1, wrapper);
+            this.next = new SettingsNodeStep(wrapper.settingsNodes()[id + 1], id + 1, wrapper);
         } else {
-            this.next = wrapper.getAfterwards();
+            this.next = wrapper.afterwards();
         }
     }
 

Core/src/main/java/com/plotsquared/core/setup/SettingsNodesWrapper.java

@@ -23,15 +23,10 @@ import com.plotsquared.core.configuration.ConfigurationNode;
 /**
  * This class wraps an array of {@link ConfigurationNode}s.
  */
-public class SettingsNodesWrapper {
+public record SettingsNodesWrapper(
-
+        ConfigurationNode[] settingsNodes,
-    private final ConfigurationNode[] settingsNodes;
+        SetupStep afterwards
-    private final SetupStep afterwards;
+) {
-
-    public SettingsNodesWrapper(final ConfigurationNode[] settingsNodes, final SetupStep afterwards) {
-        this.settingsNodes = settingsNodes;
-        this.afterwards = afterwards;
-    }
 
     /**
      * Returns the first step of this wrapper or the step or the
@@ -43,12 +38,4 @@ public class SettingsNodesWrapper {
         return this.settingsNodes.length == 0 ? this.afterwards : new SettingsNodeStep(this.settingsNodes[0], 0, this);
     }
 
-    public ConfigurationNode[] getSettingsNodes() {
-        return this.settingsNodes;
-    }
-
-    public SetupStep getAfterwards() {
-        return this.afterwards;
-    }
-
 }

Core/src/main/java/com/plotsquared/core/util/BlockUtil.java

@@ -31,8 +31,6 @@ import com.sk89q.worldedit.world.registry.LegacyMapper;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-import java.util.Map;
-
 /**
  * {@link BlockState} related utility methods
  */
@@ -109,34 +107,4 @@ public final class BlockUtil {
         }
     }
 
-    /**
-     * Parse a comma delimited list of block states
-     *
-     * @param commaDelimited List of block states
-     * @return Parsed block states
-     */
-    public static @NonNull BlockState[] parse(final @NonNull String commaDelimited) {
-        final String[] split = commaDelimited.split(",(?![^\\(\\[]*[\\]\\)])");
-        final BlockState[] result = new BlockState[split.length];
-        for (int i = 0; i < split.length; i++) {
-            result[i] = get(split[i]);
-        }
-        return result;
-    }
-
-    /**
-     * Deserialize a serialized {@link BlockState}
-     *
-     * @param map Serialized block state
-     * @return Deserialized block state, or {@code null} if the map is
-     *         not a properly serialized block state
-     */
-    public static @Nullable BlockState deserialize(final @NonNull Map<String, Object> map) {
-        if (map.containsKey("material")) {
-            final Object object = map.get("material");
-            return get(object.toString());
-        }
-        return null;
-    }
-
 }

Core/src/main/java/com/plotsquared/core/util/ChunkUtil.java

@@ -18,10 +18,6 @@
  */
 package com.plotsquared.core.util;
 
-import com.plotsquared.core.location.Location;
-import com.sk89q.worldedit.math.BlockVector2;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 /**
  * This cache is used for world generation and just saves a bit of calculation time when checking if something is in the plot area.
  */
@@ -107,22 +103,4 @@ public class ChunkUtil {
         return z_loc[j];
     }
 
-    /**
-     * Returns true if the region pos1-pos2 contains the chunk
-     *
-     * @param pos1  Region minimum point
-     * @param pos2  Region maximum point
-     * @param chunk BlockVector2 of chunk coordinates
-     * @return {@code true} if the region pos1-pos2 contains the chunk
-     */
-    public static boolean isWholeChunk(@NonNull Location pos1, @NonNull Location pos2, @NonNull BlockVector2 chunk) {
-        int x1 = pos1.getX();
-        int z1 = pos1.getZ();
-        int x2 = pos2.getX();
-        int z2 = pos2.getZ();
-        int cx = chunk.getX() << 4;
-        int cz = chunk.getZ() << 4;
-        return cx > x1 && cz > z1 && cx < x2 && cz < z2;
-    }
-
 }