refactor!: Align plugin's java version with API java version

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -7,7 +7,7 @@ body:
     attributes:
       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/).
+        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://github.com/IntellectualSites/PlotSquared-Documentation/wiki).
         Do NOT use the public issue tracker to report security vulnerabilities! They are disclosed using [this](https://forms.gle/btgdRn9yhGtzEiGW8) form!
 
   - type: dropdown
@@ -27,12 +27,13 @@ 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.19'
-        - '1.18.2'
         - '1.18.1'
         - '1.18'
         - '1.17.1'
         - '1.16.5'
+        - '1.15.2'
+        - '1.14.4'
+        - '1.13.2'
     validations:
       required: true
 

.github/ISSUE_TEMPLATE/config.yml

@@ -4,5 +4,5 @@ contact_links:
     url: https://discord.gg/intellectualsites
     about: Our support Discord, please ask questions and seek support here.
   - name: PlotSquared Wiki
-    url: https://intellectualsites.github.io/plotsquared-documentation/
+    url: https://github.com/IntellectualSites/PlotSquared-Documentation/wiki
     about: Take a look at the wiki page for instructions how to setup PlotSquared and use its commands.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -7,7 +7,7 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill out this feature request for PlotSquared! Fill out the following form to your best ability to help us understand your feature request and greately improve the change of it getting added.
-        For anything else than a feature request, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://intellectualsites.github.io/plotsquared-documentation/).
+        For anything else than a feature request, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://github.com/IntellectualSites/PlotSquared-Documentation/wiki).
 
   - type: textarea
     attributes:

.github/workflows/build.yml

@@ -4,15 +4,14 @@ on: [ pull_request, push ]
 
 jobs:
   build:
-    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2.4.0
       - name: Validate Gradle Wrapper"
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v1.0.4
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v2.5.0
         with:
           distribution: temurin
           java-version: 17

.github/workflows/codeql.yml

@@ -1,37 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ v6 ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ v6 ]
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'java' ]
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - 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/rebase.yml

@@ -0,0 +1,20 @@
+name: Rebase Pull Request
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  rebase:
+    name: Rebase
+    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') && github.event.comment.author_association == 'MEMBER'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2.4.0
+        with:
+          token: ${{ secrets.REBASE_TOKEN }}
+          fetch-depth: 0
+      - name: Automatic Rebase
+        uses: cirrus-actions/rebase@1.5
+        env:
+          GITHUB_TOKEN: ${{ secrets.REBASE_TOKEN }}

.github/workflows/release-drafter.yml

@@ -11,9 +11,8 @@ on:
 
 jobs:
   update_release_draft:
-    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@v5
+      - uses: release-drafter/release-drafter@v5.17.6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -41,8 +41,7 @@ hs_err_pid*
 *.iml
 
 ## Directory-based project format:
-/.idea/*
-!/.idea/icon.svg
+.idea/
 # if you remove the above rule, at least ignore the following:
 
 # User-specific stuff:
@@ -75,6 +74,9 @@ hs_err_pid*
 # IntelliJ
 /out/
 
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
 # JIRA plugin
 atlassian-ide-plugin.xml
 
@@ -131,9 +133,5 @@ local.properties
 checkstyle.xml
 classes/
 *.bat
-
-# Other
 docs/
 build/
-
-.DS_Store

.idea/icon.svg

@@ -1,50 +0,0 @@
-<?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">
-		<metadata id="metadata8">
-			<rdf:RDF>
-				<cc:Work rdf:about="">
-					<dc:format>image/svg+xml</dc:format>
-                    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-				</cc:Work>
-			</rdf:RDF>
-		</metadata>
-    <defs id="defs6">
-			<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" />
-    <g id="g10" inkscape:groupmode="layer" inkscape:label="PlotSquared" transform="matrix(1.3333333,0,0,-1.3333333,0,3333.3333)">
-			<g id="g12">
-				<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)">
-						<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)">
-						<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)">
-						<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)">
-						<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)">
-						<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)">
-						<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)">
-						<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)">
-						<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>
-		</g>
-</svg>

.lift.toml

@@ -0,0 +1,4 @@
+jdkVersion = "17"
+build = "gradle clean build -x test"
+tools = ["findsecbugs", "ErrorProne", "Semgrep", "Detekt", "Infer"]
+ignoreRules = ["CatchAndPrintStackTrace", "ReferenceEquality", "FallThrough", "FutureReturnValueIgnored", "MixedMutabilityReturnType", "EmptyCatch", "MissingCasesInEnumSwitch", "OperatorPrecedence", "StaticAssignmentInConstructor", "ReferenceEquality", "EqualsHashCode", "EqualsGetClass", "TypeParameterUnusedInFormals", "StringSplitter", "InlineMeSuggester", "NULL_DEREFERENCE"]

.whitesource

@@ -0,0 +1,13 @@
+{
+  "scanSettings": {
+    "baseBranches": ["v6"]
+  },
+  "checkRunSettings": {
+    "vulnerableCheckRunConclusionLevel": "success",
+    "displayMode": "diff"
+  },
+  "issueSettings": {
+    "minSeverityLevel": "LOW"
+  },
+  "enableRenovate": "true"
+}

Bukkit/build.gradle.kts

@@ -8,7 +8,7 @@ repositories {
 
     maven {
         name = "PaperMC"
-        url = uri("https://repo.papermc.io/repository/maven-public/")
+        url = uri("https://papermc.io/repo/repository/maven-public/")
     }
 
     maven {
@@ -21,20 +21,20 @@ dependencies {
     api(projects.plotSquaredCore)
 
     // Metrics
-    implementation("org.bstats:bstats-bukkit")
+    implementation(libs.bstats)
 
     // Paper
     compileOnly(libs.paper)
-    implementation("io.papermc:paperlib")
+    implementation(libs.paperlib)
 
     // Plugins
     compileOnly(libs.worldeditBukkit) {
         exclude(group = "org.bukkit")
         exclude(group = "org.spigotmc")
     }
-    compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit") { isTransitive = false }
-    testImplementation("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit") { isTransitive = false }
-    compileOnly("com.github.MilkBowl:VaultAPI") {
+    compileOnly(libs.fastasyncworldeditBukkit) { isTransitive = false }
+    testImplementation(libs.fastasyncworldeditBukkit) { isTransitive = false }
+    compileOnly(libs.vault) {
         exclude(group = "org.bukkit")
     }
     compileOnly(libs.placeholderapi)
@@ -44,15 +44,15 @@ dependencies {
 
     // Other libraries
     implementation(libs.squirrelid) { isTransitive = false }
-    implementation("dev.notmyfault.serverlib:ServerLib")
+    implementation(libs.serverlib)
 
     // Our libraries
     implementation(libs.arkitektonika)
     implementation(libs.http4j)
-    implementation("com.intellectualsites.paster:Paster")
+    implementation(libs.paster)
 
     // Adventure
-    implementation("net.kyori:adventure-platform-bukkit")
+    implementation(libs.adventurePlatformBukkit)
 }
 
 tasks.processResources {
@@ -83,10 +83,8 @@ tasks.named<ShadowJar>("shadowJar") {
     relocate("org.jetbrains", "com.plotsquared.core.annotations")
     relocate("org.intellij.lang", "com.plotsquared.core.intellij.annotations")
     relocate("javax.annotation", "com.plotsquared.core.annotation")
-    relocate("com.github.spotbugs", "com.plotsquared.core.spotbugs")
+    relocate("com.google.code.findbugs", "com.plotsquared.core.findbugs")
     relocate("javax.inject", "com.plotsquared.core.annotation.inject")
-    relocate("net.jcip", "com.plotsquared.core.annotations.jcip")
-    relocate("edu.umd.cs.findbugs", "com.plotsquared.core.annotations.findbugs")
 
     // Get rid of all the libs which are 100% unused.
     minimize()
@@ -97,11 +95,11 @@ tasks.named<ShadowJar>("shadowJar") {
 tasks {
     withType<Javadoc> {
         val opt = options as StandardJavadocDocletOptions
-        opt.links("https://jd.papermc.io/paper/1.18/")
-        opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
-        opt.links("https://javadoc.io/doc/com.plotsquared/PlotSquared-Core/latest/")
-        opt.links("https://jd.adventure.kyori.net/api/" + libs.adventure.get().versionConstraint.toString())
-        opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
+        opt.links("https://papermc.io/javadocs/paper/1.17/")
+        opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/7.2.7/")
+        opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/7.2.7/")
+        opt.links("https://jd.adventure.kyori.net/api/4.9.3/")
+        opt.links("https://google.github.io/guice/api-docs/5.0.1/javadoc/")
         opt.links("https://checkerframework.org/api/")
     }
 }

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

@@ -238,16 +238,6 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
         return this.version;
     }
 
-    @Override
-    public int versionMinHeight() {
-        return serverVersion()[1] >= 18 ? -64 : 0;
-    }
-
-    @Override
-    public int versionMaxHeight() {
-        return serverVersion()[1] >= 18 ? 319 : 255;
-    }
-
     @Override
     public @NonNull String serverImplementation() {
         return Bukkit.getVersion();
@@ -270,7 +260,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
 
         final PlotSquared plotSquared = new PlotSquared(this, "Bukkit");
 
-        // FastAsyncWorldEdit
+        // FAWE
         if (Settings.FAWE_Components.FAWE_HOOK) {
             Plugin fawe = getServer().getPluginManager().getPlugin("FastAsyncWorldEdit");
             if (fawe != null) {
@@ -278,7 +268,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                     Class.forName("com.fastasyncworldedit.bukkit.regions.plotsquared.FaweQueueCoordinator");
                     faweHook = true;
                 } catch (Exception ignored) {
-                    LOGGER.error("Incompatible version of FastAsyncWorldEdit to enable hook, please upgrade: https://ci.athion" +
+                    LOGGER.error("Incompatible version of FAWE to enable hook, please upgrade: https://ci.athion" +
                             ".net/job/FastAsyncWorldEdit/");
                 }
             }
@@ -432,7 +422,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
 
         plotSquared.startExpiryTasks();
 
-        // Once the server has loaded force updating all generators known to PlotSquared
+        // Once the server has loaded force updating all generators known to P2
         TaskManager.runTaskLater(() -> PlotSquared.platform().setupUtils().updateGenerators(true), TaskTime.ticks(1L));
 
         // Services are accessed in order
@@ -513,10 +503,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                 this.backgroundPipeline.registerService(essentialsUUIDService);
             }
 
-            if (Settings.UUID.IMPROMPTU_SERVICE_MOJANG_API) {
             final SquirrelIdUUIDService impromptuMojangService = new SquirrelIdUUIDService(Settings.UUID.IMPROMPTU_LIMIT);
             this.impromptuPipeline.registerService(impromptuMojangService);
-            }
             final SquirrelIdUUIDService backgroundMojangService = new SquirrelIdUUIDService(Settings.UUID.BACKGROUND_LIMIT);
             this.backgroundPipeline.registerService(backgroundMojangService);
         } else {

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

@@ -25,18 +25,17 @@
  */
 package com.plotsquared.bukkit.generator;
 
-import com.plotsquared.bukkit.queue.LimitedRegionWrapperQueue;
-import com.plotsquared.core.generator.HybridPlotWorld;
+import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.generator.IndependentPlotGenerator;
-import com.plotsquared.core.location.Location;
-import com.plotsquared.core.location.UncheckedWorldLocation;
+import com.plotsquared.core.location.ChunkWrapper;
 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.QueueCoordinator;
 import com.plotsquared.core.queue.ScopedQueueCoordinator;
+import com.sk89q.worldedit.bukkit.BukkitWorld;
+import org.bukkit.Chunk;
+import org.bukkit.World;
 import org.bukkit.generator.BlockPopulator;
-import org.bukkit.generator.LimitedRegion;
-import org.bukkit.generator.WorldInfo;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Random;
@@ -44,51 +43,32 @@ import java.util.Random;
 final class BlockStatePopulator extends BlockPopulator {
 
     private final IndependentPlotGenerator plotGenerator;
+    private final PlotAreaManager plotAreaManager;
 
-    /**
-     * @since 6.9.0
-     */
-    public BlockStatePopulator(
-            final @NonNull IndependentPlotGenerator plotGenerator
-    ) {
-        this.plotGenerator = plotGenerator;
-    }
+    private QueueCoordinator queue;
 
-    /**
-     * @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;
+        this.plotAreaManager = plotAreaManager;
     }
 
     @Override
-    public void populate(
-            @NonNull final WorldInfo worldInfo,
-            @NonNull final Random random,
-            final int chunkX,
-            final int chunkZ,
-            @NonNull final LimitedRegion limitedRegion
-    ) {
-        PlotArea area = UncheckedWorldLocation.at(worldInfo.getName(), chunkX << 4, 0, chunkZ << 4).getPlotArea();
-        if (area == null || (area instanceof HybridPlotWorld hpw && !hpw.populationNeeded()) || area instanceof SinglePlotArea) {
+    public void populate(final @NonNull World world, final @NonNull Random random, final @NonNull Chunk source) {
+        if (this.queue == null) {
+            this.queue = PlotSquared.platform().globalBlockQueue().getNewQueue(new BukkitWorld(world));
+        }
+        final PlotArea area = this.plotAreaManager.getPlotArea(world.getName(), null);
+        if (area == null) {
             return;
         }
-        LimitedRegionWrapperQueue wrapped = new LimitedRegionWrapperQueue(limitedRegion);
-        // It is possible for the region to be larger than the chunk, but there is no reason for P2 to need to populate
-        // outside of the actual chunk area.
-        Location min = UncheckedWorldLocation.at(worldInfo.getName(), chunkX << 4, worldInfo.getMinHeight(), chunkZ << 4);
-        Location max = UncheckedWorldLocation.at(
-                worldInfo.getName(),
-                (chunkX << 4) + 15,
-                worldInfo.getMaxHeight(),
-                (chunkZ << 4) + 15
-        );
-        ScopedQueueCoordinator offsetChunkQueue = new ScopedQueueCoordinator(wrapped, min, max);
-        this.plotGenerator.populateChunk(offsetChunkQueue, area);
+        final ChunkWrapper wrap = new ChunkWrapper(area.getWorldName(), source.getX(), source.getZ());
+        final ScopedQueueCoordinator chunk = this.queue.getForChunk(wrap.x, wrap.z);
+        if (this.plotGenerator.populateChunk(chunk, area)) {
+            this.queue.enqueue();
+        }
     }
 
 }

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

@@ -25,11 +25,7 @@
  */
 package com.plotsquared.bukkit.generator;
 
-import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.generator.AugmentedUtils;
-import com.plotsquared.core.queue.QueueCoordinator;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.util.SideEffectSet;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.generator.BlockPopulator;
@@ -56,14 +52,7 @@ public class BukkitAugmentedGenerator extends BlockPopulator {
 
     @Override
     public void populate(@NonNull World world, @NonNull Random random, @NonNull Chunk source) {
-        QueueCoordinator queue = PlotSquared.platform().globalBlockQueue().getNewQueue(BukkitAdapter.adapt(world));
-        // The chunk is already loaded and we do not want to load the chunk in "fully" by using any PaperLib methods.
-        queue.setForceSync(true);
-        queue.setSideEffectSet(SideEffectSet.none());
-        queue.setBiomesEnabled(false);
-        queue.setChunkObject(source);
-        AugmentedUtils.generateChunk(world.getName(), source.getX(), source.getZ(), queue);
-        queue.enqueue();
+        AugmentedUtils.generate(source, world.getName(), source.getX(), source.getZ(), null);
     }
 
 }

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

@@ -27,7 +27,6 @@ package com.plotsquared.bukkit.generator;
 
 import com.plotsquared.bukkit.queue.GenChunk;
 import com.plotsquared.bukkit.util.BukkitUtil;
-import com.plotsquared.bukkit.util.BukkitWorld;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.generator.GeneratorWrapper;
 import com.plotsquared.core.generator.IndependentPlotGenerator;
@@ -49,7 +48,8 @@ import java.util.List;
 import java.util.Random;
 import java.util.Set;
 
-public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrapper<ChunkGenerator> {
+public class BukkitPlotGenerator extends ChunkGenerator
+        implements GeneratorWrapper<ChunkGenerator> {
 
     @SuppressWarnings("unused")
     public final boolean PAPER_ASYNC_SAFE = true;
@@ -72,12 +72,7 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
         this.plotGenerator = generator;
         this.platformGenerator = this;
         this.populators = new ArrayList<>();
-        int minecraftMinorVersion = PlotSquared.platform().serverVersion()[1];
-        if (minecraftMinorVersion >= 17) {
-            this.populators.add(new BlockStatePopulator(this.plotGenerator));
-        } else {
-            this.populators.add(new LegacyBlockStatePopulator(this.plotGenerator));
-        }
+        this.populators.add(new BlockStatePopulator(this.plotGenerator, this.plotAreaManager));
         this.full = true;
     }
 
@@ -116,7 +111,30 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
     @Override
     public @NonNull List<BlockPopulator> getDefaultPopulators(@NonNull World world) {
         try {
-            checkLoaded(world);
+            if (!this.loaded) {
+                String name = world.getName();
+                PlotSquared.get().loadWorld(name, this);
+                final Set<PlotArea> areas = this.plotAreaManager.getPlotAreasSet(name);
+                if (!areas.isEmpty()) {
+                    PlotArea area = areas.iterator().next();
+                    if (!area.isMobSpawning()) {
+                        if (!area.isSpawnEggs()) {
+                            world.setSpawnFlags(false, false);
+                        }
+                        world.setAmbientSpawnLimit(0);
+                        world.setAnimalSpawnLimit(0);
+                        world.setMonsterSpawnLimit(0);
+                        world.setWaterAnimalSpawnLimit(0);
+                    } else {
+                        world.setSpawnFlags(true, true);
+                        world.setAmbientSpawnLimit(-1);
+                        world.setAnimalSpawnLimit(-1);
+                        world.setMonsterSpawnLimit(-1);
+                        world.setWaterAnimalSpawnLimit(-1);
+                    }
+                }
+                this.loaded = true;
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -135,52 +153,18 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
         return toAdd;
     }
 
-    private synchronized void checkLoaded(@NonNull World world) {
-        // Do not attempt to load configurations until WorldEdit has a platform ready.
-        if (!PlotSquared.get().isWeInitialised()) {
-            return;
-        }
-        if (!this.loaded) {
-            String name = world.getName();
-            PlotSquared.get().loadWorld(name, this);
-            final Set<PlotArea> areas = this.plotAreaManager.getPlotAreasSet(name);
-            if (!areas.isEmpty()) {
-                PlotArea area = areas.iterator().next();
-                if (!area.isMobSpawning()) {
-                    if (!area.isSpawnEggs()) {
-                        world.setSpawnFlags(false, false);
-                    }
-                    setSpawnLimits(world, 0);
-                } else {
-                    world.setSpawnFlags(true, true);
-                    setSpawnLimits(world, -1);
-                }
-            }
-            this.loaded = true;
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    private void setSpawnLimits(@NonNull World world, int limit) {
-        world.setAmbientSpawnLimit(limit);
-        world.setAnimalSpawnLimit(limit);
-        world.setMonsterSpawnLimit(limit);
-        world.setWaterAnimalSpawnLimit(limit);
-    }
-
     @Override
     public @NonNull ChunkData generateChunkData(
             @NonNull World world, @NonNull Random random, int x, int z,
             @NonNull BiomeGrid biome
     ) {
-        int minY = BukkitWorld.getMinWorldHeight(world);
-        int maxY = BukkitWorld.getMaxWorldHeight(world);
-        GenChunk result = new GenChunk(minY, maxY);
+
+        GenChunk result = new GenChunk();
         if (this.getPlotGenerator() instanceof SingleWorldGenerator) {
             if (result.getChunkData() != null) {
                 for (int chunkX = 0; chunkX < 16; chunkX++) {
                     for (int chunkZ = 0; chunkZ < 16; chunkZ++) {
-                        for (int y = minY; y < maxY; y++) {
+                        for (int y = 0; y < world.getMaxHeight(); y++) {
                             biome.setBiome(chunkX, y, chunkZ, Biome.PLAINS);
 
                         }
@@ -214,7 +198,9 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
     private void generate(BlockVector2 loc, World world, ScopedQueueCoordinator result) {
         // Load if improperly loaded
         if (!this.loaded) {
-            checkLoaded(world);
+            String name = world.getName();
+            PlotSquared.get().loadWorld(name, this);
+            this.loaded = true;
         }
         // Process the chunk
         if (ChunkManager.preProcessChunk(loc, result)) {

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

@@ -80,8 +80,7 @@ final class DelegatePlotGenerator extends IndependentPlotGenerator {
                     result.setBiome(x, z, BukkitAdapter.adapt(biome));
                 }
 
-                //do not annotate with Override until we discontinue support for 1.4.4 (we no longer support 1.4.4)
-                @Override
+                //do not annotate with Override until we discontinue support for 1.4.4
                 public void setBiome(int x, int y, int z, @NonNull Biome biome) {
                     result.setBiome(x, z, BukkitAdapter.adapt(biome));
 

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

@@ -1,81 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *               Copyright (C) 2014 - 2022 IntellectualSites
- *
- *     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.generator;
-
-import com.plotsquared.core.PlotSquared;
-import com.plotsquared.core.generator.HybridPlotWorld;
-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.SinglePlotArea;
-import com.plotsquared.core.queue.QueueCoordinator;
-import com.plotsquared.core.queue.ScopedQueueCoordinator;
-import com.sk89q.worldedit.bukkit.BukkitWorld;
-import com.sk89q.worldedit.util.SideEffectSet;
-import org.bukkit.Chunk;
-import org.bukkit.World;
-import org.bukkit.generator.BlockPopulator;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Random;
-
-final class LegacyBlockStatePopulator extends BlockPopulator {
-
-    private final IndependentPlotGenerator plotGenerator;
-
-    /**
-     * @since 6.9.0
-     */
-    public LegacyBlockStatePopulator(
-            final @NonNull IndependentPlotGenerator plotGenerator
-    ) {
-        this.plotGenerator = plotGenerator;
-    }
-
-    @Override
-    public void populate(@NotNull final World world, @NotNull final Random random, @NotNull final Chunk source) {
-        int chunkMinX = source.getX() << 4;
-        int chunkMinZ = source.getZ() << 4;
-        PlotArea area = Location.at(world.getName(), chunkMinX, 0, chunkMinZ).getPlotArea();
-        if (area == null || (area instanceof HybridPlotWorld hpw && !hpw.populationNeeded()) || area instanceof SinglePlotArea) {
-            return;
-        }
-
-        QueueCoordinator queue = PlotSquared.platform().globalBlockQueue().getNewQueue(new BukkitWorld(world));
-        queue.setForceSync(true);
-        queue.setSideEffectSet(SideEffectSet.none());
-        queue.setBiomesEnabled(false);
-        queue.setChunkObject(source);
-        Location min = UncheckedWorldLocation.at(world.getName(), chunkMinX, world.getMinHeight(), chunkMinZ);
-        Location max = UncheckedWorldLocation.at(world.getName(), chunkMinX + 15, world.getMaxHeight(), chunkMinZ + 15);
-        ScopedQueueCoordinator offsetChunkQueue = new ScopedQueueCoordinator(queue, min, max);
-        this.plotGenerator.populateChunk(offsetChunkQueue, area);
-        queue.enqueue();
-    }
-
-}

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

@@ -74,7 +74,6 @@ import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Fireball;
@@ -93,7 +92,6 @@ import org.bukkit.event.block.BlockFormEvent;
 import org.bukkit.event.block.BlockFromToEvent;
 import org.bukkit.event.block.BlockGrowEvent;
 import org.bukkit.event.block.BlockIgniteEvent;
-import org.bukkit.event.block.BlockMultiPlaceEvent;
 import org.bukkit.event.block.BlockPhysicsEvent;
 import org.bukkit.event.block.BlockPistonExtendEvent;
 import org.bukkit.event.block.BlockPistonRetractEvent;
@@ -168,7 +166,7 @@ public class BlockEventListener implements Listener {
         }
         if (Settings.Redstone.DISABLE_OFFLINE) {
             boolean disable = false;
-            if (!DBFunc.SERVER.equals(plot.getOwner())) {
+            if (!plot.getOwner().equals(DBFunc.SERVER)) {
                 if (plot.isMerged()) {
                     disable = true;
                     for (UUID owner : plot.getOwners()) {
@@ -279,7 +277,7 @@ public class BlockEventListener implements Listener {
         BukkitPlayer pp = BukkitUtil.adapt(player);
         Plot plot = area.getPlot(location);
         if (plot != null) {
-            if ((location.getY() >= area.getMaxBuildHeight() || location.getY() < area
+            if ((location.getY() > area.getMaxBuildHeight() || location.getY() < area
                     .getMinBuildHeight()) && !Permissions
                     .hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
                 event.setCancelled(true);
@@ -354,8 +352,7 @@ public class BlockEventListener implements Listener {
         Plot plot = area.getPlot(location);
         if (plot != null) {
             BukkitPlayer plotPlayer = BukkitUtil.adapt(player);
-            // == rather than <= as we only care about the "ground level" not being destroyed
-            if (event.getBlock().getY() == area.getMinGenHeight()) {
+            if (event.getBlock().getY() == 0) {
                 if (!Permissions
                         .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) {
                     plotPlayer.sendMessage(
@@ -365,7 +362,7 @@ public class BlockEventListener implements Listener {
                     event.setCancelled(true);
                     return;
                 }
-            } else if ((location.getY() >= area.getMaxBuildHeight() || location.getY() < area
+            } else if ((location.getY() > area.getMaxBuildHeight() || location.getY() < area
                     .getMinBuildHeight()) && !Permissions
                     .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
                 event.setCancelled(true);
@@ -551,10 +548,6 @@ public class BlockEventListener implements Listener {
         if (plot == null) {
             return;
         }
-        if (location.getY() >= area.getMaxBuildHeight() || location.getY() < area.getMinBuildHeight()) {
-            event.setCancelled(true);
-            return;
-        }
         switch (event.getNewState().getType()) {
             case SNOW:
             case SNOW_BLOCK:
@@ -654,8 +647,7 @@ public class BlockEventListener implements Listener {
                     event.getBlock().breakNaturally();
                 }
             }
-            // == rather than <= as we only care about the "ground level" not being destroyed
-            if (location.getY() == area.getMinGenHeight()) {
+            if (location.getY() == 0) {
                 event.setCancelled(true);
                 return;
             }
@@ -754,66 +746,62 @@ public class BlockEventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onChange(BlockFromToEvent event) {
-        Block fromBlock = event.getBlock();
+        Block from = event.getBlock();
 
         // Check liquid flow flag inside of origin plot too
-        final Location fromLocation = BukkitUtil.adapt(fromBlock.getLocation());
-        final PlotArea fromArea = fromLocation.getPlotArea();
+        final Location fLocation = BukkitUtil.adapt(from.getLocation());
+        final PlotArea fromArea = fLocation.getPlotArea();
         if (fromArea != null) {
-            final Plot fromPlot = fromArea.getOwnedPlot(fromLocation);
-            if (fromPlot != null && fromPlot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.DISABLED && event
+            final Plot plot = fromArea.getOwnedPlot(fLocation);
+            if (plot != null && plot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.DISABLED && event
                     .getBlock()
                     .isLiquid()) {
-                fromPlot.debug("Liquid could not flow because liquid-flow = disabled");
+                plot.debug("Liquid could not flow because liquid-flow = disabled");
                 event.setCancelled(true);
                 return;
             }
         }
 
-        Block toBlock = event.getToBlock();
-        Location toLocation = BukkitUtil.adapt(toBlock.getLocation());
-        PlotArea toArea = toLocation.getPlotArea();
-        if (toArea == null) {
-            if (fromBlock.getType() == Material.DRAGON_EGG && fromArea != null) {
+        Block to = event.getToBlock();
+        Location tLocation = BukkitUtil.adapt(to.getLocation());
+        PlotArea area = tLocation.getPlotArea();
+        if (area == null) {
+            if (from.getType() == Material.DRAGON_EGG && fromArea != null) {
                 event.setCancelled(true);
             }
             return;
         }
-        if (toLocation.getY() >= toArea.getMaxBuildHeight() || toLocation.getY() < toArea.getMinBuildHeight()) {
-            event.setCancelled(true);
-            return;
-        }
-        Plot toPlot = toArea.getOwnedPlot(toLocation);
+        Plot plot = area.getOwnedPlot(tLocation);
 
-        if (fromBlock.getType() == Material.DRAGON_EGG && fromArea != null) {
-            final Plot fromPlot = fromArea.getOwnedPlot(fromLocation);
+        if (from.getType() == Material.DRAGON_EGG && fromArea != null) {
+            final Plot fromPlot = fromArea.getOwnedPlot(fLocation);
 
-            if (fromPlot != null || toPlot != null) {
-                if ((fromPlot == null || !fromPlot.equals(toPlot)) && (toPlot == null || !toPlot.equals(fromPlot))) {
+            if (fromPlot != null || plot != null) {
+                if ((fromPlot == null || !fromPlot.equals(plot)) && (plot == null || !plot.equals(fromPlot))) {
                     event.setCancelled(true);
                     return;
                 }
             }
         }
 
-        if (toPlot != null) {
-            if (!toArea.contains(fromLocation.getX(), fromLocation.getZ()) || !Objects.equals(toPlot, toArea.getOwnedPlot(fromLocation))) {
+        if (plot != null) {
+            if (!area.contains(fLocation.getX(), fLocation.getZ()) || !Objects.equals(plot, area.getOwnedPlot(fLocation))) {
                 event.setCancelled(true);
                 return;
             }
-            if (toPlot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.ENABLED && event.getBlock().isLiquid()) {
+            if (plot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.ENABLED && event.getBlock().isLiquid()) {
                 return;
             }
-            if (toPlot.getFlag(DisablePhysicsFlag.class)) {
-                toPlot.debug(event.getBlock().getType() + " could not update because disable-physics = true");
+            if (plot.getFlag(DisablePhysicsFlag.class)) {
+                plot.debug(event.getBlock().getType() + " could not update because disable-physics = true");
                 event.setCancelled(true);
                 return;
             }
-            if (toPlot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.DISABLED && event.getBlock().isLiquid()) {
-                toPlot.debug("Liquid could not flow because liquid-flow = disabled");
+            if (plot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.DISABLED && event.getBlock().isLiquid()) {
+                plot.debug("Liquid could not flow because liquid-flow = disabled");
                 event.setCancelled(true);
             }
-        } else if (!toArea.contains(fromLocation.getX(), fromLocation.getZ()) || !Objects.equals(null, toArea.getOwnedPlot(fromLocation))) {
+        } else if (!area.contains(fLocation.getX(), fLocation.getZ()) || !Objects.equals(null, area.getOwnedPlot(fLocation))) {
             event.setCancelled(true);
         } else if (event.getBlock().isLiquid()) {
             final org.bukkit.Location location = event.getBlock().getLocation();
@@ -965,12 +953,7 @@ public class BlockEventListener implements Listener {
     public void onBlockDispense(BlockDispenseEvent event) {
         Material type = event.getItem().getType();
         switch (type.toString()) {
-            case "SHULKER_BOX", "WHITE_SHULKER_BOX", "ORANGE_SHULKER_BOX", "MAGENTA_SHULKER_BOX", "LIGHT_BLUE_SHULKER_BOX",
-                    "YELLOW_SHULKER_BOX", "LIME_SHULKER_BOX", "PINK_SHULKER_BOX", "GRAY_SHULKER_BOX", "LIGHT_GRAY_SHULKER_BOX",
-                    "CYAN_SHULKER_BOX", "PURPLE_SHULKER_BOX", "BLUE_SHULKER_BOX", "BROWN_SHULKER_BOX", "GREEN_SHULKER_BOX",
-                    "RED_SHULKER_BOX", "BLACK_SHULKER_BOX", "CARVED_PUMPKIN", "WITHER_SKELETON_SKULL", "FLINT_AND_STEEL",
-                    "BONE_MEAL", "SHEARS", "GLASS_BOTTLE", "GLOWSTONE", "COD_BUCKET", "PUFFERFISH_BUCKET", "SALMON_BUCKET",
-                    "TROPICAL_FISH_BUCKET", "AXOLOTL_BUCKET", "BUCKET", "WATER_BUCKET", "LAVA_BUCKET", "TADPOLE_BUCKET" -> {
+            case "SHULKER_BOX", "WHITE_SHULKER_BOX", "ORANGE_SHULKER_BOX", "MAGENTA_SHULKER_BOX", "LIGHT_BLUE_SHULKER_BOX", "YELLOW_SHULKER_BOX", "LIME_SHULKER_BOX", "PINK_SHULKER_BOX", "GRAY_SHULKER_BOX", "LIGHT_GRAY_SHULKER_BOX", "CYAN_SHULKER_BOX", "PURPLE_SHULKER_BOX", "BLUE_SHULKER_BOX", "BROWN_SHULKER_BOX", "GREEN_SHULKER_BOX", "RED_SHULKER_BOX", "BLACK_SHULKER_BOX", "CARVED_PUMPKIN", "WITHER_SKELETON_SKULL", "FLINT_AND_STEEL", "BONE_MEAL", "SHEARS", "GLASS_BOTTLE", "GLOWSTONE", "COD_BUCKET", "PUFFERFISH_BUCKET", "SALMON_BUCKET", "TROPICAL_FISH_BUCKET", "AXOLOTL_BUCKET", "BUCKET", "WATER_BUCKET", "LAVA_BUCKET" -> {
                 if (event.getBlock().getType() == Material.DROPPER) {
                     return;
                 }
@@ -1225,51 +1208,4 @@ public class BlockEventListener implements Listener {
         }
     }
 
-    /*
-     * BlockMultiPlaceEvent is called unrelated to the BlockPlaceEvent itself and therefore doesn't respect the cancellation.
-     */
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
-    public void onBlockMultiPlace(BlockMultiPlaceEvent event) {
-        // Check if the generic block place event would be cancelled
-        blockCreate(event);
-        if (event.isCancelled()) {
-            return;
-        }
-
-        BukkitPlayer pp = BukkitUtil.adapt(event.getPlayer());
-        Location placedLocation = BukkitUtil.adapt(event.getBlockReplacedState().getLocation());
-        PlotArea area = placedLocation.getPlotArea();
-        if (area == null) {
-            return;
-        }
-        Plot plot = placedLocation.getPlot();
-
-        for (final BlockState state : event.getReplacedBlockStates()) {
-            Location currentLocation = BukkitUtil.adapt(state.getLocation());
-            if (!Permissions.hasPermission(
-                    pp,
-                    Permission.PERMISSION_ADMIN_BUILD_ROAD
-            ) && !(Objects.equals(currentLocation.getPlot(), plot))) {
-                pp.sendMessage(
-                        TranslatableCaption.of("permission.no_permission_event"),
-                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
-                );
-                event.setCancelled(true);
-                break;
-            }
-            if (Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
-                continue;
-            }
-            if (currentLocation.getY() >= area.getMaxBuildHeight() || currentLocation.getY() < area.getMinBuildHeight()) {
-                pp.sendMessage(
-                        TranslatableCaption.of("height.height_limit"),
-                        Template.of("minHeight", String.valueOf(area.getMinBuildHeight())),
-                        Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight()))
-                );
-                event.setCancelled(true);
-                break;
-            }
-        }
-    }
-
 }

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

@@ -168,7 +168,6 @@ public class EntityEventListener implements Listener {
             case "RAID":
             case "SHEARED":
             case "SILVERFISH_BLOCK":
-            case "ENDER_PEARL":
             case "TRAP":
             case "VILLAGE_DEFENSE":
             case "VILLAGE_INVASION":
@@ -208,7 +207,7 @@ public class EntityEventListener implements Listener {
             }
             return;
         }
-        if (BukkitEntityUtil.checkEntity(entity, plot.getBasePlot(false))) {
+        if (BukkitEntityUtil.checkEntity(entity, plot)) {
             event.setCancelled(true);
         }
     }

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

@@ -36,7 +36,6 @@ import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Chunk;
 import org.bukkit.World;
-import org.bukkit.block.Block;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
@@ -192,32 +191,8 @@ public class EntitySpawnListener implements Listener {
 
     @EventHandler
     public void onTeleport(EntityTeleportEvent event) {
-        Entity entity = event.getEntity();
-        Entity fromLocation = event.getEntity();
-        Block toLocation = event.getTo().getBlock();
-        final Location fromLocLocation = BukkitUtil.adapt(fromLocation.getLocation());
-        final PlotArea fromArea = fromLocLocation.getPlotArea();
-        Location toLocLocation = BukkitUtil.adapt(toLocation.getLocation());
-        PlotArea toArea = toLocLocation.getPlotArea();
-
-        if (toArea == null) {
-            if (fromLocation.getType() == EntityType.SHULKER && fromArea != null) {
-                event.setCancelled(true);
-            }
-            return;
-        }
-        Plot toPlot = toArea.getOwnedPlot(toLocLocation);
-        if (fromLocation.getType() == EntityType.SHULKER && fromArea != null) {
-            final Plot fromPlot = fromArea.getOwnedPlot(fromLocLocation);
-
-            if (fromPlot != null || toPlot != null) {
-                if ((fromPlot == null || !fromPlot.equals(toPlot)) && (toPlot == null || !toPlot.equals(fromPlot))) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-        }
-        if (entity instanceof Vehicle || entity instanceof ArmorStand) {
+        Entity ent = event.getEntity();
+        if (ent instanceof Vehicle || ent instanceof ArmorStand) {
             testNether(event.getEntity());
         }
     }

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

@@ -44,7 +44,6 @@ import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
-import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.Permissions;
 import net.kyori.adventure.text.minimessage.Template;
@@ -196,7 +195,6 @@ public class PaperListener implements Listener {
             case "RAID":
             case "SHEARED":
             case "SILVERFISH_BLOCK":
-            case "ENDER_PEARL":
             case "TRAP":
             case "VILLAGE_DEFENSE":
             case "VILLAGE_INVASION":
@@ -354,7 +352,6 @@ public class PaperListener implements Listener {
                 event.setCancelled(true);
             }
         } else if (!plot.isAdded(pp.getUUID())) {
-            if (!plot.getFlag(ProjectilesFlag.class)) {
             if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
@@ -365,7 +362,6 @@ public class PaperListener implements Listener {
             }
         }
     }
-    }
 
     @EventHandler
     public void onAsyncTabCompletion(final AsyncTabCompleteEvent event) {

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

@@ -76,6 +76,7 @@ import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.Permissions;
 import com.plotsquared.core.util.PremiumVerification;
+import com.plotsquared.core.util.RegExUtil;
 import com.plotsquared.core.util.entity.EntityCategories;
 import com.plotsquared.core.util.task.TaskManager;
 import com.plotsquared.core.util.task.TaskTime;
@@ -222,9 +223,10 @@ public class PlayerEventListener extends PlotListener implements Listener {
         }
     }
 
+    @SuppressWarnings("StringSplitter")
     @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
     public void playerCommand(PlayerCommandPreprocessEvent event) {
-        String msg = event.getMessage().replace("/", "").toLowerCase(Locale.ROOT).trim();
+        String msg = event.getMessage().toLowerCase().replaceAll("/", "").trim();
         if (msg.isEmpty()) {
             return;
         }
@@ -238,9 +240,11 @@ public class PlayerEventListener extends PlotListener implements Listener {
         String[] parts = msg.split(" ");
         Plot plot = plotPlayer.getCurrentPlot();
         // Check WorldEdit
-        switch (parts[0]) {
+        switch (parts[0].toLowerCase()) {
             case "up":
+            case "/up":
             case "worldedit:up":
+            case "worldedit:/up":
                 if (plot == null || (!plot.isAdded(plotPlayer.getUUID()) && !Permissions
                         .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_OTHER, true))) {
                     event.setCancelled(true);
@@ -254,40 +258,15 @@ public class PlayerEventListener extends PlotListener implements Listener {
         List<String> blockedCommands = plot != null ?
                 plot.getFlag(BlockedCmdsFlag.class) :
                 area.getFlag(BlockedCmdsFlag.class);
-        if (blockedCommands.isEmpty()) {
-            return;
-        }
-        if (Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
-            return;
-        }
-        // When using namespaced commands, we're not interested in the namespace
+        if (!blockedCommands.isEmpty() && !Permissions
+                .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
             String part = parts[0];
-        if (part.contains(":")) {
-            String[] namespaced = part.split(":");
-            part = namespaced[1];
-            msg = msg.substring(namespaced[0].length() + 1);
+            if (parts[0].contains(":")) {
+                part = parts[0].split(":")[1];
+                msg = msg.replace(parts[0].split(":")[0] + ':', "");
             }
-        msg = replaceAliases(msg, part);
-        for (String blocked : blockedCommands) {
-            if (blocked.equalsIgnoreCase(msg)) {
-                String perm;
-                if (plot != null && plot.isAdded(plotPlayer.getUUID())) {
-                    perm = "plots.admin.command.blocked-cmds.shared";
-                } else {
-                    perm = "plots.admin.command.blocked-cmds.road";
-                }
-                if (!Permissions.hasPermission(plotPlayer, perm)) {
-                    plotPlayer.sendMessage(TranslatableCaption.of("blockedcmds.command_blocked"));
-                    event.setCancelled(true);
-                }
-                return;
-            }
-        }
-    }
-
-    private String replaceAliases(String msg, String part) {
             String s1 = part;
-        Set<String> aliases = new HashSet<>();
+            List<String> aliases = new ArrayList<>();
             for (HelpTopic cmdLabel : Bukkit.getServer().getHelpMap().getHelpTopics()) {
                 if (part.equals(cmdLabel.getName())) {
                     break;
@@ -296,8 +275,8 @@ public class PlayerEventListener extends PlotListener implements Listener {
                 if (aliases.contains(label)) {
                     continue;
                 }
-            PluginCommand p = Bukkit.getPluginCommand(label);
-            if (p != null) {
+                PluginCommand p;
+                if ((p = Bukkit.getPluginCommand(label)) != null) {
                     for (String a : p.getAliases()) {
                         if (aliases.contains(a)) {
                             continue;
@@ -314,7 +293,28 @@ public class PlayerEventListener extends PlotListener implements Listener {
             if (!s1.equals(part)) {
                 msg = msg.replace(s1, part);
             }
-        return msg;
+            for (String s : blockedCommands) {
+                Pattern pattern;
+                if (!RegExUtil.compiledPatterns.containsKey(s)) {
+                    RegExUtil.compiledPatterns.put(s, pattern = Pattern.compile(s));
+                } else {
+                    pattern = RegExUtil.compiledPatterns.get(s);
+                }
+                if (pattern.matcher(msg).matches()) {
+                    String perm;
+                    if (plot != null && plot.isAdded(plotPlayer.getUUID())) {
+                        perm = "plots.admin.command.blocked-cmds.shared";
+                    } else {
+                        perm = "plots.admin.command.blocked-cmds.road";
+                    }
+                    if (!Permissions.hasPermission(plotPlayer, perm)) {
+                        plotPlayer.sendMessage(TranslatableCaption.of("blockedcmds.command_blocked"));
+                        event.setCancelled(true);
+                    }
+                    return;
+                }
+            }
+        }
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)

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

@@ -35,7 +35,6 @@ import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.PlotHandler;
-import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.Permissions;
 import net.kyori.adventure.text.minimessage.Template;
@@ -129,7 +128,6 @@ public class ProjectileEventListener implements Listener {
                 event.setCancelled(true);
             }
         } else if (!plot.isAdded(pp.getUUID())) {
-            if (!plot.getFlag(ProjectilesFlag.class)) {
             if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
@@ -140,7 +138,6 @@ public class ProjectileEventListener implements Listener {
             }
         }
     }
-    }
 
     @EventHandler
     public void onProjectileHit(ProjectileHitEvent event) {
@@ -165,7 +162,7 @@ public class ProjectileEventListener implements Listener {
                 return;
             }
             if (plot.isAdded(pp.getUUID()) || Permissions
-                    .hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER) || plot.getFlag(ProjectilesFlag.class)) {
+                    .hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
                 return;
             }
             entity.remove();

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

@@ -46,7 +46,7 @@ import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
 public class SingleWorldListener implements Listener {
 
     private final Method methodGetHandleChunk;
-    private Field shouldSave = null;
+    private Field shouldSave;
 
     public SingleWorldListener() throws Exception {
         ReflectionUtils.RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
@@ -59,12 +59,9 @@ public class SingleWorldListener implements Listener {
                 } else {
                     this.shouldSave = classChunk.getField("s").getRealField();
                 }
-            } else if (PlotSquared.platform().serverVersion()[1] == 17) {
+            } else {
                 ReflectionUtils.RefClass classChunk = getRefClass("net.minecraft.world.level.chunk.Chunk");
                 this.shouldSave = classChunk.getField("r").getRealField();
-            } else if (PlotSquared.platform().serverVersion()[1] == 18) {
-                ReflectionUtils.RefClass classChunk = getRefClass("net.minecraft.world.level.chunk.IChunkAccess");
-                this.shouldSave = classChunk.getField("b").getRealField();
             }
         } catch (NoSuchFieldException e) {
             e.printStackTrace();

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

@@ -38,7 +38,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
  * @deprecated Deprecated and scheduled for removal without replacement
  *         in favor of the build in setup wizard.
  */
-@Deprecated(forRemoval = true, since = "6.0.0")
+@Deprecated(forRemoval = true)
 @Singleton
 public class MultiverseWorldManager extends BukkitWorldManager {
 

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

@@ -74,13 +74,11 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
     private final Consumer<Throwable> throwableConsumer;
     private final boolean unloadAfter;
     private final int totalSize;
-    private final AtomicInteger expectedSize;
-    private final AtomicInteger loadingChunks = new AtomicInteger();
-    private final boolean forceSync;
 
+    private final AtomicInteger expectedSize;
     private int batchSize;
     private PlotSquaredTask task;
-    private volatile boolean shouldCancel;
+    private boolean shouldCancel;
     private boolean finished;
 
     @Inject
@@ -92,9 +90,8 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
             @Assisted final @NonNull Collection<BlockVector2> requestedChunks,
             @Assisted final @NonNull Runnable whenDone,
             @Assisted final @NonNull Consumer<Throwable> throwableConsumer,
-            @Assisted("unloadAfter") final boolean unloadAfter,
-            @Assisted final @NonNull Collection<ProgressSubscriber> progressSubscribers,
-            @Assisted("forceSync") final boolean forceSync
+            @Assisted final boolean unloadAfter,
+            @Assisted final @NonNull Collection<ProgressSubscriber> progressSubscribers
     ) {
         this.requestedChunks = new LinkedBlockingQueue<>(requestedChunks);
         this.availableChunks = new LinkedBlockingQueue<>();
@@ -109,27 +106,14 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
         this.plugin = JavaPlugin.getPlugin(BukkitPlatform.class);
         this.bukkitWorld = Bukkit.getWorld(world.getName());
         this.progressSubscribers.addAll(progressSubscribers);
-        this.forceSync = forceSync;
     }
 
     @Override
     public void start() {
-        if (!forceSync) {
         // Request initial batch
         this.requestBatch();
         // Wait until next tick to give the chunks a chance to be loaded
         TaskManager.runTaskLater(() -> task = TaskManager.runTaskRepeat(this, TaskTime.ticks(1)), TaskTime.ticks(1));
-        } else {
-            try {
-                while (!shouldCancel && !requestedChunks.isEmpty()) {
-                    chunkConsumer.accept(requestedChunks.poll());
-                }
-            } catch (Throwable t) {
-                throwableConsumer.accept(t);
-            } finally {
-                finish();
-            }
-        }
     }
 
     @Override
@@ -146,9 +130,7 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
             for (final ProgressSubscriber subscriber : this.progressSubscribers) {
                 subscriber.notifyEnd();
             }
-            if (task != null) {
             task.cancel();
-            }
             finished = true;
         }
     }
@@ -168,13 +150,6 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
 
         Chunk chunk = this.availableChunks.poll();
         if (chunk == null) {
-            if (this.availableChunks.isEmpty()) {
-                if (this.requestedChunks.isEmpty() && loadingChunks.get() == 0) {
-                    finish();
-                } else {
-                    requestBatch();
-                }
-            }
             return;
         }
         long[] iterationTime = new long[2];
@@ -222,11 +197,9 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
         BlockVector2 chunk;
         for (int i = 0; i < this.batchSize && (chunk = this.requestedChunks.poll()) != null; i++) {
             // This required PaperLib to be bumped to version 1.0.4 to mark the request as urgent
-            loadingChunks.incrementAndGet();
             PaperLib
                     .getChunkAtAsync(this.bukkitWorld, chunk.getX(), chunk.getZ(), true, true)
                     .whenComplete((chunkObject, throwable) -> {
-                        loadingChunks.decrementAndGet();
                         if (throwable != null) {
                             throwable.printStackTrace();
                             // We want one less because this couldn't be processed

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

@@ -51,7 +51,6 @@ import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
 import org.bukkit.block.Block;
 import org.bukkit.block.Container;
 import org.bukkit.block.data.BlockData;
@@ -63,27 +62,10 @@ import java.util.function.Consumer;
 
 public class BukkitQueueCoordinator extends BasicQueueCoordinator {
 
-    private static final SideEffectSet NO_SIDE_EFFECT_SET;
-    private static final SideEffectSet EDGE_SIDE_EFFECT_SET;
-    private static final SideEffectSet LIGHTING_SIDE_EFFECT_SET;
-    private static final SideEffectSet EDGE_LIGHTING_SIDE_EFFECT_SET;
-
-    static {
-        NO_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.LIGHTING, SideEffect.State.OFF).with(
-                SideEffect.NEIGHBORS,
-                SideEffect.State.OFF
-        );
-        EDGE_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.UPDATE, SideEffect.State.ON).with(
-                SideEffect.NEIGHBORS,
-                SideEffect.State.ON
-        );
-        LIGHTING_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.NEIGHBORS, SideEffect.State.OFF);
-        EDGE_LIGHTING_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.UPDATE, SideEffect.State.ON).with(
-                SideEffect.NEIGHBORS,
-                SideEffect.State.ON
-        );
-    }
-
+    private final SideEffectSet noSideEffectSet;
+    private final SideEffectSet lightingSideEffectSet;
+    private final SideEffectSet edgeSideEffectSet;
+    private final SideEffectSet edgeLightingSideEffectSet;
     private org.bukkit.World bukkitWorld;
     @Inject
     private ChunkCoordinatorBuilderFactory chunkCoordinatorBuilderFactory;
@@ -94,6 +76,19 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
     @Inject
     public BukkitQueueCoordinator(@NonNull World world) {
         super(world);
+        noSideEffectSet = SideEffectSet.none().with(SideEffect.LIGHTING, SideEffect.State.OFF).with(
+                SideEffect.NEIGHBORS,
+                SideEffect.State.OFF
+        );
+        lightingSideEffectSet = SideEffectSet.none().with(SideEffect.NEIGHBORS, SideEffect.State.OFF);
+        edgeSideEffectSet = noSideEffectSet.with(SideEffect.UPDATE, SideEffect.State.ON).with(
+                SideEffect.NEIGHBORS,
+                SideEffect.State.ON
+        );
+        edgeLightingSideEffectSet = noSideEffectSet.with(SideEffect.UPDATE, SideEffect.State.ON).with(
+                SideEffect.NEIGHBORS,
+                SideEffect.State.ON
+        );
     }
 
     @Override
@@ -116,8 +111,8 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
     public boolean enqueue() {
         final Clipboard regenClipboard;
         if (isRegen()) {
-            BlockVector3 start = BlockVector3.at(getRegenStart()[0] << 4, getMinY(), getRegenStart()[1] << 4);
-            BlockVector3 end = BlockVector3.at((getRegenEnd()[0] << 4) + 15, getMaxY(), (getRegenEnd()[1] << 4) + 15);
+            BlockVector3 start = BlockVector3.at(getRegenStart()[0] << 4, 0, getRegenStart()[1] << 4);
+            BlockVector3 end = BlockVector3.at((getRegenEnd()[0] << 4) + 15, 255, (getRegenEnd()[1] << 4) + 15);
             Region region = new CuboidRegion(start, end);
             regenClipboard = new BlockArrayClipboard(region);
             regenClipboard.setOrigin(start);
@@ -139,7 +134,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
                 int sx = blockVector2.getX() << 4;
                 int sz = blockVector2.getZ() << 4;
                 if (isRegenChunk) {
-                    for (int layer = getMinLayer(); layer <= getMaxLayer(); layer++) {
+                    for (int layer = 0; layer < 16; layer++) {
                         for (int y = 0; y < 16; y++) {
                             for (int x = 0; x < 16; x++) {
                                 for (int z = 0; z < 16; z++) {
@@ -175,7 +170,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
                             int lx = ChunkUtil.getX(j);
                             int lz = ChunkUtil.getZ(j);
                             int x = sx + lx;
-                            int y = ChunkUtil.getY(layer + localChunk.getMinSection(), j);
+                            int y = ChunkUtil.getY(layer, j);
                             int z = sz + lz;
                             boolean edge = Settings.QUEUE.UPDATE_EDGES && isEdge(y >> 4, lx, y & 15, lz, blockVector2,
                                     localChunk
@@ -184,7 +179,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
                         }
                     }
                 }
-                for (int layer = 0; layer < localChunk.getBiomes().length; layer++) {
+                for (int layer = 0; layer < localChunk.getBaseblocks().length; layer++) {
                     BiomeType[] biomesLayer = localChunk.getBiomes()[layer];
                     if (biomesLayer == null) {
                         continue;
@@ -206,7 +201,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
                     localChunk.getTiles().forEach((blockVector3, tag) -> {
                         try {
                             BaseBlock block = getWorld().getBlock(blockVector3).toBaseBlock(tag);
-                            getWorld().setBlock(blockVector3, block, getSideEffectSet(SideEffectState.NONE));
+                            getWorld().setBlock(blockVector3, block, noSideEffectSet);
                         } catch (WorldEditException ignored) {
                             StateWrapper sw = new StateWrapper(tag);
                             sw.restoreTag(getWorld().getName(), blockVector3.getX(), blockVector3.getY(), blockVector3.getZ());
@@ -235,7 +230,6 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
                         .withConsumer(consumer)
                         .unloadAfter(isUnloadAfter())
                         .withProgressSubscribers(getProgressSubscribers())
-                        .forceSync(isForceSync())
                         .build();
         return super.enqueue();
     }
@@ -264,21 +258,15 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
             }
             SideEffectSet sideEffectSet;
             if (lighting) {
-                sideEffectSet = getSideEffectSet(edge ? SideEffectState.EDGE_LIGHTING : SideEffectState.LIGHTING);
+                sideEffectSet = edge ? edgeLightingSideEffectSet : lightingSideEffectSet;
             } else {
-                sideEffectSet = getSideEffectSet(edge ? SideEffectState.EDGE : SideEffectState.NONE);
+                sideEffectSet = edge ? edgeSideEffectSet : noSideEffectSet;
             }
             getWorld().setBlock(loc, block, sideEffectSet);
         } catch (WorldEditException ignored) {
             // Fallback to not so nice method
             BlockData blockData = BukkitAdapter.adapt(block);
-            Block existing;
-            // Assume a chunk object has been given only when it should have been.
-            if (getChunkObject() instanceof Chunk chunkObject) {
-                existing = chunkObject.getBlock(x & 15, y, z & 15);
-            } else {
-                 existing = getBukkitWorld().getBlockAt(x, y, z);
-            }
+            Block existing = getBukkitWorld().getBlockAt(x, y, z);
             final BlockState existingBaseBlock = BukkitAdapter.adapt(existing.getBlockData());
             if (BukkitBlockUtil.get(existing).equals(existingBaseBlock) && existing.getBlockData().matches(blockData)) {
                 return;
@@ -294,7 +282,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
                 CompoundTag tag = block.getNbtData();
                 StateWrapper sw = new StateWrapper(tag);
 
-                sw.restoreTag(existing);
+                sw.restoreTag(getWorld().getName(), existing.getX(), existing.getY(), existing.getZ());
             }
         }
     }
@@ -307,48 +295,47 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
     }
 
     private boolean isEdge(int layer, int x, int y, int z, BlockVector2 blockVector2, LocalChunk localChunk) {
-        int layerIndex = (layer - localChunk.getMinSection());
-        if (layer == localChunk.getMinSection() || layerIndex == localChunk.getBaseblocks().length - 1) {
+        if (layer == 0 || layer == localChunk.getBaseblocks().length - 1) {
             return false;
         }
         if (x == 0) {
             LocalChunk localChunkX = getBlockChunks().get(blockVector2.withX(blockVector2.getX() - 1));
-            if (localChunkX == null || localChunkX.getBaseblocks()[layerIndex] == null ||
-                    localChunkX.getBaseblocks()[layerIndex][ChunkUtil.getJ(15, y, z)] != null) {
+            if (localChunkX == null || localChunkX.getBaseblocks()[layer] == null ||
+                    localChunkX.getBaseblocks()[layer][ChunkUtil.getJ(15, y, z)] != null) {
                 return true;
             }
         } else if (x == 15) {
             LocalChunk localChunkX = getBlockChunks().get(blockVector2.withX(blockVector2.getX() + 1));
-            if (localChunkX == null || localChunkX.getBaseblocks()[layerIndex] == null ||
-                    localChunkX.getBaseblocks()[layerIndex][ChunkUtil.getJ(0, y, z)] != null) {
+            if (localChunkX == null || localChunkX.getBaseblocks()[layer] == null ||
+                    localChunkX.getBaseblocks()[layer][ChunkUtil.getJ(0, y, z)] != null) {
                 return true;
             }
         }
         if (z == 0) {
             LocalChunk localChunkZ = getBlockChunks().get(blockVector2.withZ(blockVector2.getZ() - 1));
-            if (localChunkZ == null || localChunkZ.getBaseblocks()[layerIndex] == null ||
-                    localChunkZ.getBaseblocks()[layerIndex][ChunkUtil.getJ(x, y, 15)] != null) {
+            if (localChunkZ == null || localChunkZ.getBaseblocks()[layer] == null ||
+                    localChunkZ.getBaseblocks()[layer][ChunkUtil.getJ(x, y, 15)] != null) {
                 return true;
             }
         } else if (z == 15) {
             LocalChunk localChunkZ = getBlockChunks().get(blockVector2.withZ(blockVector2.getZ() + 1));
-            if (localChunkZ == null || localChunkZ.getBaseblocks()[layerIndex] == null ||
-                    localChunkZ.getBaseblocks()[layerIndex][ChunkUtil.getJ(x, y, 0)] != null) {
+            if (localChunkZ == null || localChunkZ.getBaseblocks()[layer] == null ||
+                    localChunkZ.getBaseblocks()[layer][ChunkUtil.getJ(x, y, 0)] != null) {
                 return true;
             }
         }
         if (y == 0) {
-            if (localChunk.getBaseblocks()[layerIndex - 1] == null ||
-                    localChunk.getBaseblocks()[layerIndex][ChunkUtil.getJ(x, 15, z)] != null) {
+            if (localChunk.getBaseblocks()[layer - 1] == null ||
+                    localChunk.getBaseblocks()[layer][ChunkUtil.getJ(x, 15, z)] != null) {
                 return true;
             }
         } else if (y == 15) {
-            if (localChunk.getBaseblocks()[layerIndex + 1] == null ||
-                    localChunk.getBaseblocks()[layerIndex][ChunkUtil.getJ(x, 0, z)] != null) {
+            if (localChunk.getBaseblocks()[layer + 1] == null ||
+                    localChunk.getBaseblocks()[layer][ChunkUtil.getJ(x, 0, z)] != null) {
                 return true;
             }
         }
-        BaseBlock[] baseBlocks = localChunk.getBaseblocks()[layerIndex];
+        BaseBlock[] baseBlocks = localChunk.getBaseblocks()[layer];
         if (x > 0 && baseBlocks[ChunkUtil.getJ(x - 1, y, z)] == null) {
             return true;
         }
@@ -387,23 +374,4 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
         return false;
     }
 
-    private SideEffectSet getSideEffectSet(SideEffectState state) {
-        if (getSideEffectSet() != null) {
-            return getSideEffectSet();
-        }
-        return switch (state) {
-            case NONE -> NO_SIDE_EFFECT_SET;
-            case EDGE -> EDGE_SIDE_EFFECT_SET;
-            case LIGHTING -> LIGHTING_SIDE_EFFECT_SET;
-            case EDGE_LIGHTING -> EDGE_LIGHTING_SIDE_EFFECT_SET;
-        };
-    }
-
-    private enum SideEffectState {
-        NONE,
-        EDGE,
-        LIGHTING,
-        EDGE_LIGHTING
-    }
-
 }

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

@@ -31,7 +31,6 @@ import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.core.location.ChunkWrapper;
 import com.plotsquared.core.location.Location;
 import com.plotsquared.core.queue.ScopedQueueCoordinator;
-import com.plotsquared.core.util.AnnotationHelper;
 import com.plotsquared.core.util.ChunkUtil;
 import com.plotsquared.core.util.PatternUtil;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
@@ -51,7 +50,6 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.Arrays;
 
-@AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.")
 public class GenChunk extends ScopedQueueCoordinator {
 
     public final Biome[] biomes;
@@ -63,14 +61,8 @@ public class GenChunk extends ScopedQueueCoordinator {
     public int chunkZ;
     private ChunkData chunkData = null;
 
-    /**
-     * @param minY minimum world Y, inclusive
-     * @param maxY maximum world Y, inclusive
-     *
-     * @since 6.6.0
-     */
-    public GenChunk(int minY, int maxY) {
-        super(null, Location.at("", 0, minY, 0), Location.at("", 15, maxY, 15));
+    public GenChunk() {
+        super(null, Location.at("", 0, 0, 0), Location.at("", 15, 255, 15));
         this.biomes = Biome.values();
     }
 
@@ -110,7 +102,7 @@ public class GenChunk extends ScopedQueueCoordinator {
     /**
      * Set the world and XZ of the chunk being represented via {@link ChunkWrapper}
      *
-     * @param wrap PlotSquared ChunkWrapper
+     * @param wrap P2 ChunkWrapper
      */
     public void setChunk(@NonNull ChunkWrapper wrap) {
         chunk = null;
@@ -125,7 +117,7 @@ public class GenChunk extends ScopedQueueCoordinator {
             return;
         }
         Biome biome = BukkitAdapter.adapt(biomeType);
-        for (int y = getMin().getY(); y <= getMax().getY(); y++) {
+        for (int y = 0; y < 256; y++) {
             for (int x = 0; x < 16; x++) {
                 for (int z = 0; z < 16; z++) {
                     this.biomeGrid.setBiome(x, y, z, biome);
@@ -138,7 +130,7 @@ public class GenChunk extends ScopedQueueCoordinator {
     public void setCuboid(@NonNull Location pos1, @NonNull Location pos2, @NonNull BlockState block) {
         if (result != null && pos1.getX() == 0 && pos1.getZ() == 0 && pos2.getX() == 15 && pos2.getZ() == 15) {
             for (int y = pos1.getY(); y <= pos2.getY(); y++) {
-                int layer = getLayerIndex(y);
+                int layer = y >> 4;
                 BlockState[] data = result[layer];
                 if (data == null) {
                     result[layer] = data = new BlockState[4096];
@@ -172,7 +164,7 @@ public class GenChunk extends ScopedQueueCoordinator {
      */
     public boolean setBiome(int x, int z, @NonNull Biome biome) {
         if (this.biomeGrid != null) {
-            for (int y = getMin().getY(); y <= getMax().getY(); y++) {
+            for (int y = 0; y < 256; y++) {
                 this.setBiome(x, y, z, biome);
             }
             return true;
@@ -205,7 +197,7 @@ public class GenChunk extends ScopedQueueCoordinator {
     }
 
     private void storeCache(final int x, final int y, final int z, final @NonNull BlockState id) {
-        int i = getLayerIndex(y);
+        int i = y >> 4;
         BlockState[] v = this.result[i];
         if (v == null) {
             this.result[i] = v = new BlockState[4096];
@@ -227,7 +219,7 @@ public class GenChunk extends ScopedQueueCoordinator {
 
     @Override
     public @Nullable BlockState getBlock(int x, int y, int z) {
-        int i = getLayerIndex(y);
+        int i = y >> 4;
         if (result == null) {
             return BukkitBlockUtil.get(chunkData.getType(x, y, z));
         }
@@ -254,16 +246,16 @@ public class GenChunk extends ScopedQueueCoordinator {
 
     @Override
     public @NonNull Location getMax() {
-        return Location.at(getWorld().getName(), 15 + (getX() << 4), super.getMax().getY(), 15 + (getZ() << 4));
+        return Location.at(getWorld().getName(), 15 + (getX() << 4), 255, 15 + (getZ() << 4));
     }
 
     @Override
     public @NonNull Location getMin() {
-        return Location.at(getWorld().getName(), getX() << 4, super.getMin().getY(), getZ() << 4);
+        return Location.at(getWorld().getName(), getX() << 4, 0, getZ() << 4);
     }
 
     public @NonNull GenChunk clone() {
-        GenChunk toReturn = new GenChunk(getMin().getY(), getMax().getY());
+        GenChunk toReturn = new GenChunk();
         if (this.result != null) {
             for (int i = 0; i < this.result.length; i++) {
                 BlockState[] matrix = this.result[i];
@@ -277,8 +269,4 @@ public class GenChunk extends ScopedQueueCoordinator {
         return toReturn;
     }
 
-    private int getLayerIndex(int y) {
-        return (y - getMin().getY()) >> 4;
-    }
-
 }

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

@@ -1,128 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *               Copyright (C) 2014 - 2022 IntellectualSites
- *
- *     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.queue;
-
-import com.plotsquared.bukkit.schematic.StateWrapper;
-import com.plotsquared.core.queue.DelegateQueueCoordinator;
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.entity.Entity;
-import com.sk89q.worldedit.function.pattern.Pattern;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.world.block.BaseBlock;
-import com.sk89q.worldedit.world.block.BlockState;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.bukkit.Location;
-import org.bukkit.entity.EntityType;
-import org.bukkit.generator.LimitedRegion;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-/**
- * Wraps a {@link LimitedRegion} inside a {@link com.plotsquared.core.queue.QueueCoordinator} so it can be written to.
- *
- * @since 6.9.0
- */
-public class LimitedRegionWrapperQueue extends DelegateQueueCoordinator {
-
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + LimitedRegionWrapperQueue.class.getSimpleName());
-
-    private final LimitedRegion limitedRegion;
-
-    /**
-     * @since 6.9.0
-     */
-    public LimitedRegionWrapperQueue(LimitedRegion limitedRegion) {
-        super(null);
-        this.limitedRegion = limitedRegion;
-    }
-
-    @Override
-    public boolean setBlock(final int x, final int y, final int z, @NonNull final Pattern pattern) {
-        return setBlock(x, y, z, pattern.applyBlock(BlockVector3.at(x, y, z)));
-    }
-
-    @Override
-    public boolean setBlock(final int x, final int y, final int z, @NonNull final BaseBlock id) {
-        boolean result = setBlock(x, y, z, id.toImmutableState());
-        if (result && id.hasNbtData()) {
-            CompoundTag tag = id.getNbtData();
-            StateWrapper sw = new StateWrapper(tag);
-            try {
-                sw.restoreTag(limitedRegion.getBlockState(x, y, z).getBlock());
-            } catch (IllegalArgumentException e) {
-                LOGGER.error("Error attempting to populate tile entity into the world at location {},{},{}", x, y, z, e);
-                return false;
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public boolean setBlock(final int x, final int y, final int z, @NonNull final BlockState id) {
-        try {
-            limitedRegion.setType(x, y, z, BukkitAdapter.adapt(id.getBlockType()));
-            limitedRegion.setBlockData(x, y, z, BukkitAdapter.adapt(id));
-        } catch (IllegalArgumentException e) {
-            LOGGER.error("Error attempting to populate block into the world at location {},{},{}", x, y, z, e);
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public boolean setEntity(@NonNull final Entity entity) {
-        EntityType type = BukkitAdapter.adapt(entity.getState().getType());
-        double x = entity.getLocation().getX();
-        double y = entity.getLocation().getY();
-        double z = entity.getLocation().getZ();
-        Location location = new Location(limitedRegion.getWorld(), x, y, z);
-        try {
-            limitedRegion.spawnEntity(location, type);
-        } catch (IllegalArgumentException e) {
-            LOGGER.error("Error attempting to populate entity into the world at location {},{},{}", (int) x, (int) y, (int) z, e);
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public boolean setTile(final int x, final int y, final int z, @NonNull final CompoundTag tag) {
-        StateWrapper sw = new StateWrapper(tag);
-        try {
-            return sw.restoreTag(limitedRegion.getBlockState(x, y, z).getBlock());
-        } catch (IllegalArgumentException e) {
-            LOGGER.error("Error attempting to populate tile entity into the world at location {},{},{}", x, y, z, e);
-            return false;
-        }
-    }
-
-    @Override
-    public boolean isSettingTiles() {
-        return true;
-    }
-
-}

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

@@ -35,18 +35,15 @@ 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 org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.Container;
 import org.bukkit.block.Sign;
-import org.bukkit.block.Skull;
 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;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -59,11 +56,6 @@ public class StateWrapper {
     public org.bukkit.block.BlockState state = null;
     public CompoundTag tag = null;
 
-    /**
-     * @deprecated in favour of using WE methods for obtaining NBT, specifically by obtaining a
-     *         {@link com.sk89q.worldedit.world.block.BaseBlock} and then using {@link com.sk89q.worldedit.world.block.BaseBlock#getNbtData()}
-     */
-    @Deprecated(forRemoval = true, since = "6.9.0")
     public StateWrapper(org.bukkit.block.BlockState state) {
         this.state = state;
     }
@@ -174,32 +166,14 @@ public class StateWrapper {
         return str;
     }
 
-    /**
-     * Restore the TileEntity data to the given world at the given coordinates.
-     *
-     * @param worldName World name
-     * @param x         x position
-     * @param y         y position
-     * @param z         z position
-     * @return true if successful
-     */
+    @SuppressWarnings("deprecation") // #setLine is needed for Spigot compatibility
     public boolean restoreTag(String worldName, int x, int y, int z) {
-        World world = BukkitUtil.getWorld(worldName);
-        if (world == null) {
+        if (this.tag == null) {
             return false;
         }
-        return restoreTag(world.getBlockAt(x, y, z));
-    }
-
-    /**
-     * Restore the TileEntity data to the given block
-     *
-     * @param block Block to restore to
-     * @return true if successful
-     */
-    @SuppressWarnings("deprecation") // #setLine is needed for Spigot compatibility
-    public boolean restoreTag(@NonNull Block block) {
-        if (this.tag == null) {
+        World world = BukkitUtil.getWorld(worldName);
+        Block block = world.getBlockAt(x, y, z);
+        if (block == null) {
             return false;
         }
         org.bukkit.block.BlockState state = block.getState();
@@ -237,37 +211,10 @@ public class StateWrapper {
                 }
                 return false;
             }
-            case "skull" -> {
-                if (state instanceof Skull skull) {
-                    CompoundTag skullOwner = ((CompoundTag) this.tag.getValue().get("SkullOwner"));
-                    if (skullOwner == null) {
-                        return true;
-                    }
-                    String player = skullOwner.getString("Name");
-                    if (player == null || player.isEmpty()) {
-                        return false;
-                    }
-                    try {
-                        skull.setOwningPlayer(Bukkit.getOfflinePlayer(player));
-                        skull.update(true);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    return true;
-                }
-                return false;
-            }
         }
         return false;
     }
 
-    /**
-     * Get a CompoundTag of the contents of a block's inventory (chest, furnace, etc.).
-     *
-     * @deprecated in favour of using WorldEdit methods for obtaining NBT, specifically by obtaining a
-     *         {@link com.sk89q.worldedit.world.block.BaseBlock} and then using {@link com.sk89q.worldedit.world.block.BaseBlock#getNbtData()}
-     */
-    @Deprecated(forRemoval = true, since = "6.9.0")
     public CompoundTag getTag() {
         if (this.tag != null) {
             return this.tag;

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

@@ -42,7 +42,6 @@ import org.bukkit.inventory.InventoryView;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -51,15 +50,11 @@ import java.util.stream.IntStream;
 @Singleton
 public class BukkitInventoryUtil extends InventoryUtil {
 
-    private static @Nullable ItemStack getItem(PlotItemStack item) {
+    private static ItemStack getItem(PlotItemStack item) {
         if (item == null) {
             return null;
         }
-        Material material = BukkitAdapter.adapt(item.getType());
-        if (material == null) {
-            return null;
-        }
-        ItemStack stack = new ItemStack(material, item.getAmount());
+        ItemStack stack = new ItemStack(BukkitAdapter.adapt(item.getType()), item.getAmount());
         ItemMeta meta = null;
         if (item.getName() != null) {
             meta = stack.getItemMeta();
@@ -109,19 +104,14 @@ public class BukkitInventoryUtil extends InventoryUtil {
     }
 
     @Override
-    public boolean setItemChecked(PlotInventory inv, int index, PlotItemStack item) {
+    public void setItem(PlotInventory inv, int index, PlotItemStack item) {
         BukkitPlayer bp = (BukkitPlayer) inv.getPlayer();
         InventoryView opened = bp.player.getOpenInventory();
-        ItemStack stack = getItem(item);
-        if (stack == null) {
-            return false;
-        }
         if (!inv.isOpen()) {
-            return true;
+            return;
         }
-        opened.setItem(index, stack);
+        opened.setItem(index, getItem(item));
         bp.player.updateInventory();
-        return true;
     }
 
     @SuppressWarnings("deprecation") // Paper deprecation

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

@@ -40,6 +40,7 @@ import com.plotsquared.core.queue.QueueCoordinator;
 import com.plotsquared.core.queue.ScopedQueueCoordinator;
 import com.plotsquared.core.util.ChunkManager;
 import com.plotsquared.core.util.RegionManager;
+import com.plotsquared.core.util.RegionUtil;
 import com.plotsquared.core.util.WorldUtil;
 import com.plotsquared.core.util.entity.EntityCategories;
 import com.plotsquared.core.util.task.RunnableVal;
@@ -260,7 +261,7 @@ public class BukkitRegionManager extends RegionManager {
             if (checkX2 && checkZ2) {
                 map.saveRegion(world, xxt2, xxt, zzt2, zzt); //
             }
-            CuboidRegion currentPlotClear = new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3());
+            CuboidRegion currentPlotClear = RegionUtil.createRegion(pos1.getX(), pos2.getX(), pos1.getZ(), pos2.getZ());
             map.saveEntitiesOut(Bukkit.getWorld(world.getName()).getChunkAt(x, z), currentPlotClear);
             AugmentedUtils.bypass(
                     ignoreAugment,
@@ -275,16 +276,20 @@ public class BukkitRegionManager extends RegionManager {
                                     PlotLoc plotLoc = new PlotLoc(bx + x1, bz + z1);
                                     BaseBlock[] ids = map.allBlocks.get(plotLoc);
                                     if (ids != null) {
-                                        int minY = value.getMin().getY();
-                                        for (int yIndex = 0; yIndex < ids.length; yIndex++) {
-                                            int y = yIndex + minY;
-                                            BaseBlock id = ids[yIndex];
+                                        for (int y = 0; y < Math.min(128, ids.length); y++) {
+                                            BaseBlock id = ids[y];
                                             if (id != null) {
                                                 value.setBlock(x1, y, z1, id);
                                             } else {
                                                 value.setBlock(x1, y, z1, BlockTypes.AIR.getDefaultState());
                                             }
                                         }
+                                        for (int y = Math.min(128, ids.length); y < ids.length; y++) {
+                                            BaseBlock id = ids[y];
+                                            if (id != null) {
+                                                value.setBlock(x1, y, z1, id);
+                                            }
+                                        }
                                     }
                                 }
                             }
@@ -292,7 +297,7 @@ public class BukkitRegionManager extends RegionManager {
                     }, world.getName(), chunk)
             );
             //map.restoreBlocks(worldObj, 0, 0);
-            map.restoreEntities(Bukkit.getWorld(world.getName()));
+            map.restoreEntities(Bukkit.getWorld(world.getName()), 0, 0);
         });
         regenQueue.setCompleteTask(whenDone);
         queue.setCompleteTask(regenQueue::enqueue);

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

@@ -76,7 +76,7 @@ public class BukkitSetupUtils extends SetupUtils {
 
     @Override
     public void updateGenerators(final boolean force) {
-        if (loaded && !SetupUtils.generators.isEmpty() && !force) {
+        if (!SetupUtils.generators.isEmpty() && !force) {
             return;
         }
         String testWorld = "CheckingPlotSquaredGenerator";
@@ -100,7 +100,6 @@ public class BukkitSetupUtils extends SetupUtils {
                 e.printStackTrace();
             }
         }
-        loaded = true;
     }
 
     @Override

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

@@ -44,6 +44,7 @@ import com.plotsquared.core.util.task.TaskManager;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.bukkit.BukkitWorld;
 import com.sk89q.worldedit.math.BlockVector2;
+import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BlockCategories;
 import com.sk89q.worldedit.world.block.BlockState;
@@ -60,6 +61,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.Sign;
@@ -244,9 +246,7 @@ public class BukkitUtil extends WorldUtil {
             final World bukkitWorld = Objects.requireNonNull(getWorld(world));
             // Skip top and bottom block
             int air = 1;
-            int maxY = com.plotsquared.bukkit.util.BukkitWorld.getMaxWorldHeight(bukkitWorld);
-            int minY = com.plotsquared.bukkit.util.BukkitWorld.getMinWorldHeight(bukkitWorld);
-            for (int y = maxY - 1; y >= minY; y--) {
+            for (int y = bukkitWorld.getMaxHeight() - 1; y >= 0; y--) {
                 Block block = bukkitWorld.getBlockAt(x, y, z);
                 Material type = block.getType();
                 if (type.isSolid()) {
@@ -273,9 +273,7 @@ public class BukkitUtil extends WorldUtil {
         final World bukkitWorld = Objects.requireNonNull(getWorld(world));
         // Skip top and bottom block
         int air = 1;
-        int maxY = com.plotsquared.bukkit.util.BukkitWorld.getMaxWorldHeight(bukkitWorld);
-        int minY = com.plotsquared.bukkit.util.BukkitWorld.getMinWorldHeight(bukkitWorld);
-        for (int y = maxY - 1; y >= minY; y--) {
+        for (int y = bukkitWorld.getMaxHeight() - 1; y >= 0; y--) {
             Block block = bukkitWorld.getBlockAt(x, y, z);
             Material type = block.getType();
             if (type.isSolid()) {
@@ -347,16 +345,14 @@ public class BukkitUtil extends WorldUtil {
             final Block block = world.getBlockAt(location.getX(), location.getY(), location.getZ());
             final Material type = block.getType();
             if (type != Material.LEGACY_SIGN && type != Material.LEGACY_WALL_SIGN) {
-                BlockFace facing = BlockFace.NORTH;
-                if (!world.getBlockAt(location.getX(), location.getY(), location.getZ() + 1).getType().isSolid()) {
-                    if (world.getBlockAt(location.getX() - 1, location.getY(), location.getZ()).getType().isSolid()) {
-                        facing = BlockFace.EAST;
+                BlockFace facing = BlockFace.EAST;
+                if (world.getBlockAt(location.getX(), location.getY(), location.getZ() + 1).getType().isSolid()) {
+                    facing = BlockFace.NORTH;
                 } else if (world.getBlockAt(location.getX() + 1, location.getY(), location.getZ()).getType().isSolid()) {
                     facing = BlockFace.WEST;
                 } else if (world.getBlockAt(location.getX(), location.getY(), location.getZ() - 1).getType().isSolid()) {
                     facing = BlockFace.SOUTH;
                 }
-                }
                 if (PlotSquared.platform().serverVersion()[1] == 13) {
                     block.setType(Material.valueOf(area.legacySignMaterial()), false);
                 } else {
@@ -375,7 +371,7 @@ public class BukkitUtil extends WorldUtil {
                     sign.setLine(i, LEGACY_COMPONENT_SERIALIZER
                             .serialize(MINI_MESSAGE.parse(lines[i].getComponent(LocaleHolder.console()), replacements)));
                 }
-                sign.update(true, false);
+                sign.update(true);
             }
         });
     }
@@ -386,6 +382,27 @@ public class BukkitUtil extends WorldUtil {
         return new StringComparison<BlockState>().new ComparisonResult(1, state);
     }
 
+    @Override
+    public void setBiomes(
+            final @NonNull String worldName,
+            final @NonNull CuboidRegion region,
+            final @NonNull BiomeType biomeType
+    ) {
+        final World world = getWorld(worldName);
+        if (world == null) {
+            LOGGER.warn("An error occurred while setting the biome because the world was null", new RuntimeException());
+            return;
+        }
+        final Biome biome = BukkitAdapter.adapt(biomeType);
+        for (int x = region.getMinimumPoint().getX(); x <= region.getMaximumPoint().getX(); x++) {
+            for (int z = region.getMinimumPoint().getZ(); z <= region.getMaximumPoint().getZ(); z++) {
+                if (world.getBiome(x, z) != biome) {
+                    world.setBiome(x, z, biome);
+                }
+            }
+        }
+    }
+
     @Override
     public com.sk89q.worldedit.world.@NonNull World getWeWorld(final @NonNull String world) {
         return new BukkitWorld(Bukkit.getWorld(world));

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

@@ -36,18 +36,6 @@ import java.util.Objects;
 public class BukkitWorld implements World<org.bukkit.World> {
 
     private static final Map<String, BukkitWorld> worldMap = Maps.newHashMap();
-    private static final boolean HAS_MIN_Y;
-
-    static {
-        boolean temp;
-        try {
-            org.bukkit.World.class.getMethod("getMinHeight");
-            temp = true;
-        } catch (NoSuchMethodException e) {
-            temp = false;
-        }
-        HAS_MIN_Y = temp;
-    }
 
     private final org.bukkit.World world;
 
@@ -85,24 +73,6 @@ public class BukkitWorld implements World<org.bukkit.World> {
         return bukkitWorld;
     }
 
-    /**
-     * Get the min world height from a Bukkit {@link org.bukkit.World}. Inclusive
-     *
-     * @since 6.6.0
-     */
-    public static int getMinWorldHeight(org.bukkit.World world) {
-        return HAS_MIN_Y ? world.getMinHeight() : 0;
-    }
-
-    /**
-     * Get the max world height from a Bukkit {@link org.bukkit.World}. Exclusive
-     *
-     * @since 6.6.0
-     */
-    public static int getMaxWorldHeight(org.bukkit.World world) {
-        return HAS_MIN_Y ? world.getMaxHeight() : 256;
-    }
-
     @Override
     public org.bukkit.World getPlatformWorld() {
         return this.world;
@@ -113,41 +83,34 @@ public class BukkitWorld implements World<org.bukkit.World> {
         return this.world.getName();
     }
 
-    @Override
-    public int getMinHeight() {
-        return getMinWorldHeight(world);
-    }
-
-    @Override
-    public int getMaxHeight() {
-        return getMaxWorldHeight(world) - 1;
-    }
-
-    @Override
     public boolean equals(final Object o) {
-        if (this == o) {
+        if (o == this) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (!(o instanceof final BukkitWorld other)) {
             return false;
         }
-        final BukkitWorld that = (BukkitWorld) o;
-        return world.equals(that.world);
+        if (!other.canEqual(this)) {
+            return false;
+        }
+        if (!Objects.equals(this.world, other.world)) {
+            return false;
+        }
+        return true;
     }
 
-    @Override
-    public int hashCode() {
-        return world.hashCode();
-    }
-
-    /**
-     * @deprecated This method is not meant to be invoked or overridden, with no replacement.
-     */
-    @Deprecated(forRemoval = true, since = "6.6.0")
     protected boolean canEqual(final Object other) {
         return other instanceof BukkitWorld;
     }
 
+    public int hashCode() {
+        final int PRIME = 59;
+        int result = 1;
+        final Object $world = this.world;
+        result = result * PRIME + ($world == null ? 43 : $world.hashCode());
+        return result;
+    }
+
     public String toString() {
         return "BukkitWorld(world=" + this.world + ")";
     }

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

@@ -70,7 +70,7 @@ public class ContentMap {
         }
         for (int x = x1; x <= x2; x++) {
             for (int z = z1; z <= z2; z++) {
-                saveBlocks(world, x, z);
+                saveBlocks(world, 256, x, z, 0, 0);
             }
         }
     }
@@ -92,7 +92,14 @@ public class ContentMap {
         }
     }
 
-    void saveEntitiesIn(Chunk chunk, CuboidRegion region, boolean delete) {
+    void saveEntitiesIn(Chunk chunk, CuboidRegion region) {
+        saveEntitiesIn(chunk, region, 0, 0, false);
+    }
+
+    void saveEntitiesIn(
+            Chunk chunk, CuboidRegion region, int offsetX, int offsetZ,
+            boolean delete
+    ) {
         for (Entity entity : chunk.getEntities()) {
             Location location = BukkitUtil.adapt(entity.getLocation());
             int x = location.getX();
@@ -104,6 +111,8 @@ public class ContentMap {
                 continue;
             }
             EntityWrapper wrap = new ReplicatingEntityWrapper(entity, (short) 2);
+            wrap.x += offsetX;
+            wrap.z += offsetZ;
             wrap.saveEntity();
             this.entities.add(wrap);
             if (delete) {
@@ -114,10 +123,10 @@ public class ContentMap {
         }
     }
 
-    void restoreEntities(World world) {
+    void restoreEntities(World world, int xOffset, int zOffset) {
         for (EntityWrapper entity : this.entities) {
             try {
-                entity.spawn(world, 0, 0);
+                entity.spawn(world, xOffset, zOffset);
             } catch (Exception e) {
                 LOGGER.error("Failed to restore entity", e);
             }
@@ -125,13 +134,15 @@ public class ContentMap {
         this.entities.clear();
     }
 
-    private void saveBlocks(BukkitWorld world, int x, int z) {
-        BaseBlock[] ids = new BaseBlock[world.getMaxY() - world.getMinY() + 1];
-        for (short yIndex = 0; yIndex <= world.getMaxY() - world.getMinY(); yIndex++) {
-            BaseBlock block = world.getFullBlock(BlockVector3.at(x, yIndex + world.getMinY(), z));
-            ids[yIndex] = block;
+    //todo optimize maxY
+    void saveBlocks(BukkitWorld world, int maxY, int x, int z, int offsetX, int offsetZ) {
+        maxY = Math.min(255, maxY);
+        BaseBlock[] ids = new BaseBlock[maxY + 1];
+        for (short y = 0; y <= maxY; y++) {
+            BaseBlock block = world.getFullBlock(BlockVector3.at(x, y, z));
+            ids[y] = block;
         }
-        PlotLoc loc = new PlotLoc(x, z);
+        PlotLoc loc = new PlotLoc(x + offsetX, z + offsetZ);
         this.allBlocks.put(loc, ids);
     }
 

Bukkit/src/main/java/com/plotsquared/bukkit/util/fawe/FaweRegionManager.java

@@ -110,11 +110,6 @@ public class FaweRegionManager extends BukkitRegionManager {
         delegate.setBiome(region, extendBiome, biome, world, whenDone);
     }
 
-    @Override
-    public void setBiome(CuboidRegion region, int extendBiome, BiomeType biome, PlotArea area, Runnable whenDone) {
-        delegate.setBiome(region, extendBiome, biome, area.getWorldName(), whenDone);
-    }
-
     @Override
     public boolean copyRegion(
             final @NonNull Location pos1,

Bukkit/src/main/java/com/plotsquared/bukkit/util/fawe/FaweSchematicHandler.java

@@ -67,7 +67,7 @@ public class FaweSchematicHandler extends SchematicHandler {
             final PlotPlayer<?> actor,
             final RunnableVal<Boolean> whenDone
     ) {
-        delegate.paste(schematic, plot, xOffset, yOffset, zOffset, autoHeight, actor, whenDone);
+        delegate.paste(schematic, plot, xOffset, yOffset, zOffset, autoHeight, whenDone);
     }
 
     @Override

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@alexander-soderberg.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

@@ -2,18 +2,18 @@ import java.time.format.DateTimeFormatter
 
 dependencies {
     // Expected everywhere.
-    compileOnlyApi("org.checkerframework:checker-qual")
+    compileOnlyApi(libs.checkerqual)
 
     // Minecraft expectations
-    compileOnlyApi("com.google.code.gson:gson")
-    compileOnly("com.google.guava:guava")
+    compileOnlyApi(libs.gson)
+    compileOnly(libs.guava)
 
     // Platform expectations
-    compileOnlyApi("org.yaml:snakeyaml")
+    compileOnlyApi(libs.snakeyaml)
 
     // Adventure
-    api("net.kyori:adventure-api")
-    api("net.kyori:adventure-text-minimessage")
+    api(libs.adventure)
+    api(libs.minimessage)
 
     // Guice
     api(libs.guice) {
@@ -22,7 +22,7 @@ dependencies {
     api(libs.guiceassistedinject) {
         exclude("com.google.inject", "guice")
     }
-    api(libs.spotbugs)
+    api(libs.findbugs)
 
     // Plugins
     compileOnly(libs.worldeditCore) {
@@ -31,18 +31,18 @@ dependencies {
         exclude(group = "dummypermscompat")
     }
     testImplementation(libs.worldeditCore)
-    compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core") { isTransitive = false }
-    testImplementation("com.fastasyncworldedit:FastAsyncWorldEdit-Core") { isTransitive = false }
+    compileOnly(libs.fastasyncworldeditCore) { isTransitive = false }
+    testImplementation(libs.fastasyncworldeditCore) { isTransitive = false }
 
     // Logging
-    compileOnlyApi("org.apache.logging.log4j:log4j-api")
+    compileOnlyApi(libs.log4j)
 
     // Other libraries
     api(libs.prtree)
     api(libs.aopalliance)
     api(libs.cloudServices)
     api(libs.arkitektonika)
-    api("com.intellectualsites.paster:Paster")
+    api(libs.paster)
 }
 
 tasks.processResources {
@@ -54,13 +54,3 @@ tasks.processResources {
         )
     }
 }
-
-tasks {
-    withType<Javadoc> {
-        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/" + libs.adventure.get().versionConstraint.toString())
-        opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
-        opt.links("https://checkerframework.org/api/")
-    }
-}

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

@@ -98,22 +98,6 @@ public interface PlotPlatform<P> extends LocaleHolder {
      */
     int[] serverVersion();
 
-    /**
-     * Gets the default minimum world height for the version of Minecraft that the server is running.
-     *
-     * @return minimum world height
-     * @since 6.6.0
-     */
-    int versionMinHeight();
-
-    /**
-     * Gets the default maximum world height for the version of Minecraft that the server is running.
-     *
-     * @return maximum world height (inclusive)
-     * @since 6.6.0
-     */
-    int versionMaxHeight();
-
     /**
      * Gets the server implementation name and version
      *
@@ -290,7 +274,6 @@ public interface PlotPlatform<P> extends LocaleHolder {
      * Get the {@link PlotAreaManager} implementation.
      *
      * @return the PlotAreaManager
-     * @since 6.1.4
      */
     @NonNull PlotAreaManager plotAreaManager();
 
@@ -359,9 +342,9 @@ public interface PlotPlatform<P> extends LocaleHolder {
     @NonNull String toLegacyPlatformString(@NonNull Component component);
 
     /**
-     * Returns if the FastAsyncWorldEdit-PlotSquared hook is active/enabled
+     * Returns if the FAWE-P2 hook is active/enabled
      *
-     * @return status of FastAsyncWorldEdit-PlotSquared hook
+     * @return status of FAWE-P2 hook
      */
     default boolean isFaweHooking() {
         return false;

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

@@ -72,10 +72,7 @@ import com.plotsquared.core.util.ReflectionUtils;
 import com.plotsquared.core.util.task.TaskManager;
 import com.plotsquared.core.uuid.UUIDPipeline;
 import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.event.platform.PlatformReadyEvent;
 import com.sk89q.worldedit.math.BlockVector2;
-import com.sk89q.worldedit.util.eventbus.EventHandler;
-import com.sk89q.worldedit.util.eventbus.Subscribe;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@@ -156,8 +153,6 @@ public class PlotSquared {
     private EventDispatcher eventDispatcher;
     private PlotListener plotListener;
 
-    private boolean weInitialised;
-
     /**
      * Initialize PlotSquared with the desired Implementation class.
      *
@@ -228,7 +223,6 @@ public class PlotSquared {
             }
 
             this.worldedit = WorldEdit.getInstance();
-            WorldEdit.getInstance().getEventBus().register(new WEPlatformReadyListener());
 
             // Create Event utility class
             this.eventDispatcher = new EventDispatcher(this.worldedit);
@@ -312,7 +306,7 @@ public class PlotSquared {
      *
      * @param version  First version
      * @param version2 Second version
-     * @return {@code true} if `version` is >= `version2`
+     * @return true if `version` is >= `version2`
      */
     public boolean checkVersion(
             final int[] version,
@@ -344,11 +338,9 @@ public class PlotSquared {
 
     /**
      * Add a global reference to a plot world.
-     * <p>
-     * You can remove the reference by calling {@link #removePlotArea(PlotArea)}
-     * </p>
      *
      * @param plotArea the {@link PlotArea} to add.
+     * @see #removePlotArea(PlotArea) To remove the reference
      */
     @SuppressWarnings("unchecked")
     public void addPlotArea(final @NonNull PlotArea plotArea) {
@@ -741,7 +733,7 @@ public class PlotSquared {
      *
      * @param plot      the plot to remove
      * @param callEvent If to call an event about the plot being removed
-     * @return {@code true} if plot existed | {@code false} if it didn't
+     * @return true if plot existed | false if it didn't
      */
     public boolean removePlot(
             final @NonNull Plot plot,
@@ -895,8 +887,8 @@ public class PlotSquared {
                             e.printStackTrace();
                         }
                         LOGGER.info("| generator: {}>{}", baseGenerator, areaGen);
-                        LOGGER.info("| plot world: {}", pa.getClass().getCanonicalName());
-                        LOGGER.info("| manager: {}", pa.getPlotManager().getClass().getCanonicalName());
+                        LOGGER.info("| plot world: {}", pa);
+                        LOGGER.info("| manager: {}", pa);
                         LOGGER.info("Note: Area created for cluster '{}' (invalid or old configuration?)", name);
                         areaGen.getPlotGenerator().initialize(pa);
                         areaGen.augment(pa);
@@ -912,13 +904,6 @@ public class PlotSquared {
                     throw new IllegalArgumentException("Invalid Generator: " + gen_string);
                 }
                 PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, null, null, null);
-                LOGGER.info("- generator: {}>{}", baseGenerator, areaGen);
-                LOGGER.info("- plot world: {}", pa.getClass().getCanonicalName());
-                LOGGER.info("- plot area manager: {}", pa.getPlotManager().getClass().getCanonicalName());
-                if (!this.worldConfiguration.contains(path)) {
-                    this.worldConfiguration.createSection(path);
-                    worldSection = this.worldConfiguration.getConfigurationSection(path);
-                }
                 pa.saveConfiguration(worldSection);
                 pa.loadDefaultConfiguration(worldSection);
                 try {
@@ -926,6 +911,9 @@ public class PlotSquared {
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
+                LOGGER.info("- generator: {}>{}", baseGenerator, areaGen);
+                LOGGER.info("- plot world: {}", pa);
+                LOGGER.info("- plot area manager: {}", pa.getPlotManager());
                 areaGen.getPlotGenerator().initialize(pa);
                 areaGen.augment(pa);
                 addPlotArea(pa);
@@ -1030,8 +1018,8 @@ public class PlotSquared {
             // save configuration
 
             final List<String> validArguments = Arrays
-                    .asList("s=", "size=", "g=", "gap=", "h=", "height=", "minh=", "minheight=", "maxh=", "maxheight=",
-                            "f=", "floor=", "m=", "main=", "w=", "wall=", "b=", "border="
+                    .asList("s=", "size=", "g=", "gap=", "h=", "height=", "f=", "floor=", "m=", "main=",
+                            "w=", "wall=", "b=", "border="
                     );
 
             // Calculate the number of expected arguments
@@ -1110,14 +1098,6 @@ public class PlotSquared {
                                     ConfigurationUtil.INTEGER.parseString(value).shortValue()
                             );
                         }
-                        case "minh", "minheight" -> this.worldConfiguration.set(
-                                base + "world.min_gen_height",
-                                ConfigurationUtil.INTEGER.parseString(value).shortValue()
-                        );
-                        case "maxh", "maxheight" -> this.worldConfiguration.set(
-                                base + "world.max_gen_height",
-                                ConfigurationUtil.INTEGER.parseString(value).shortValue()
-                        );
                         case "f", "floor" -> this.worldConfiguration.set(
                                 base + "plot.floor",
                                 ConfigurationUtil.BLOCK_BUCKET.parseString(value).toString()
@@ -1496,7 +1476,7 @@ public class PlotSquared {
      *
      * @param world            World name
      * @param chunkCoordinates Chunk coordinates
-     * @return {@code true} if the chunk uses non-standard generation, {@code false} if not
+     * @return True if the chunk uses non-standard generation, false if not
      */
     public boolean isNonStandardGeneration(
             final @NonNull String world,
@@ -1541,12 +1521,10 @@ public class PlotSquared {
     /**
      * Get the caption map belonging to a namespace. If none exists, a dummy
      * caption map will be returned.
-     * <p>
-     * You can register a caption map by calling {@link #registerCaptionMap(String, CaptionMap)}
-     * </p>
      *
      * @param namespace Namespace
      * @return Map instance
+     * @see #registerCaptionMap(String, CaptionMap) To register a caption map
      */
     public @NonNull CaptionMap getCaptionMap(final @NonNull String namespace) {
         return this.captionMaps.computeIfAbsent(
@@ -1580,13 +1558,6 @@ public class PlotSquared {
         return this.plotListener;
     }
 
-    /**
-     * Get if the {@link PlatformReadyEvent} has been sent by WorldEdit. There is no way to query this within WorldEdit itself.
-     */
-    public boolean isWeInitialised() {
-        return weInitialised;
-    }
-
     /**
      * Different ways of sorting {@link Plot plots}
      */
@@ -1609,15 +1580,4 @@ public class PlotSquared {
         DISTANCE_FROM_ORIGIN
     }
 
-    private final class WEPlatformReadyListener {
-
-        @SuppressWarnings("unused")
-        @Subscribe(priority = EventHandler.Priority.VERY_EARLY)
-        public void onPlatformReady(PlatformReadyEvent event) {
-            weInitialised = true;
-            WorldEdit.getInstance().getEventBus().unregister(WEPlatformReadyListener.this);
-        }
-
-    }
-
 }

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

@@ -122,7 +122,7 @@ public final class PlotVersion {
      * Compare a given version string with the one cached here.
      *
      * @param versionString the version to compare
-     * @return {@code true} if the given version is a "later" version
+     * @return true if the given version is a "later" version
      */
     public boolean isLaterVersion(final @NonNull String versionString) {
         int dash = versionString.indexOf('-');
@@ -144,7 +144,7 @@ public final class PlotVersion {
      * Compare a given version with the one cached here.
      *
      * @param verArray the version to compare
-     * @return {@code true} if the given version is a "later" version
+     * @return true if the given version is a "later" version
      */
     public boolean isLaterVersion(int[] verArray) {
         if (verArray[0] > version[0]) {

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

@@ -88,7 +88,7 @@ public interface BackupManager {
      * Returns true if (potentially) destructive actions should cause
      * PlotSquared to create automatic plot backups
      *
-     * @return {@code true} if automatic backups are enabled
+     * @return True if automatic backups are enabled
      */
     boolean shouldAutomaticallyBackup();
 

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

@@ -75,7 +75,6 @@ import com.sk89q.worldedit.function.operation.Operations;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldedit.world.World;
 import net.kyori.adventure.text.minimessage.Template;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
@@ -192,12 +191,11 @@ public class Area extends SubCommand {
                 final BlockVector3 playerSelectionMin = playerSelectedRegion.getMinimumPoint();
                 final BlockVector3 playerSelectionMax = playerSelectedRegion.getMaximumPoint();
                 // Create a new selection that spans the entire vertical range of the world
-                World world = playerSelectedRegion.getWorld();
                 final CuboidRegion selectedRegion =
                         new CuboidRegion(
                                 playerSelectedRegion.getWorld(),
-                                BlockVector3.at(playerSelectionMin.getX(), world.getMinY(), playerSelectionMin.getZ()),
-                                BlockVector3.at(playerSelectionMax.getX(), world.getMaxY(), playerSelectionMax.getZ())
+                                BlockVector3.at(playerSelectionMin.getX(), 0, playerSelectionMin.getZ()),
+                                BlockVector3.at(playerSelectionMax.getX(), 255, playerSelectionMax.getZ())
                         );
                 // There's only one plot in the area...
                 final PlotId plotId = PlotId.of(1, 1);
@@ -280,9 +278,9 @@ public class Area extends SubCommand {
                     if (offsetZ != 0) {
                         this.worldConfiguration.set(path + ".road.offset.z", offsetZ);
                     }
-                    final String worldName = this.setupUtils.setupWorld(singleBuilder);
-                    if (this.worldUtil.isWorld(worldName)) {
-                        PlotSquared.get().loadWorld(worldName, null);
+                    final String world = this.setupUtils.setupWorld(singleBuilder);
+                    if (this.worldUtil.isWorld(world)) {
+                        PlotSquared.get().loadWorld(world, null);
                         player.sendMessage(TranslatableCaption.of("single.single_area_created"));
                     } else {
                         player.sendMessage(
@@ -371,8 +369,7 @@ public class Area extends SubCommand {
                                 int lower = (area.ROAD_WIDTH & 1) == 0 ? area.ROAD_WIDTH / 2 - 1 : area.ROAD_WIDTH / 2;
                                 final int offsetX = bx - (area.ROAD_WIDTH == 0 ? 0 : lower);
                                 final int offsetZ = bz - (area.ROAD_WIDTH == 0 ? 0 : lower);
-                                // Height doesn't matter for this region
-                                final CuboidRegion region = RegionUtil.createRegion(bx, tx, 0, 0, bz, tz);
+                                final CuboidRegion region = RegionUtil.createRegion(bx, tx, bz, tz);
                                 final Set<PlotArea> areas = this.plotAreaManager.getPlotAreasSet(area.getWorldName(), region);
                                 if (!areas.isEmpty()) {
                                     player.sendMessage(

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

@@ -34,7 +34,7 @@ import net.kyori.adventure.text.minimessage.Template;
  * @deprecated In favor of "/plot toggle chat" and
  *         scheduled for removal within the next major release.
  */
-@Deprecated(forRemoval = true, since = "6.0.0")
+@Deprecated(forRemoval = true)
 @CommandDeclaration(command = "chat",
         usage = "/plot chat",
         permission = "plots.chat",

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

@@ -288,7 +288,7 @@ public abstract class Command {
      * @param args     Arguments
      * @param confirm  Instance, Success, Failure
      * @param whenDone task to run when done
-     * @return CompletableFuture {@code true} if the command executed fully, {@code false} in
+     * @return CompletableFuture true if the command executed fully, false in
      *         any other case
      */
     public CompletableFuture<Boolean> execute(

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

@@ -28,7 +28,6 @@ package com.plotsquared.core.command;
 import com.plotsquared.core.configuration.caption.Caption;
 import com.plotsquared.core.configuration.caption.LocaleHolder;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.player.PlotPlayer;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
@@ -96,16 +95,4 @@ public enum CommandCategory implements Caption {
     public String getComponent(@NonNull LocaleHolder localeHolder) {
         return this.caption.getComponent(localeHolder);
     }
-
-    /**
-     * Checks if a player has access to this command category
-     *
-     * @param player The player to check against
-     * @return {@code true} if at least one command of this category can be executed by the player, {@code false} otherwise
-     * @since 6.5.0
-     */
-    boolean canAccess(PlotPlayer<?> player) {
-        return !MainCommand.getInstance().getCommands(this, player).isEmpty();
-    }
-
 }

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

@@ -48,7 +48,7 @@ public class Confirm extends SubCommand {
             player.sendMessage(TranslatableCaption.of("confirm.expired_confirm"));
             return false;
         }
-        TaskManager.runTask(command.command);
+        TaskManager.runTaskAsync(command.command);
         return true;
     }
 

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

@@ -49,7 +49,6 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
@@ -208,7 +207,7 @@ public class DebugExec extends SubCommand {
                     }
                     boolean result;
                     if (HybridUtils.regions != null) {
-                        result = this.hybridUtils.scheduleRoadUpdate(area, HybridUtils.regions, 0, new LinkedHashSet<>());
+                        result = this.hybridUtils.scheduleRoadUpdate(area, HybridUtils.regions, 0, new HashSet<>());
                     } else {
                         result = this.hybridUtils.scheduleRoadUpdate(area, 0);
                     }

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

@@ -161,7 +161,6 @@ public class Deny extends SubCommand {
     }
 
     private void handleKick(PlotPlayer<?> player, Plot plot) {
-        plot = plot.getBasePlot(false);
         if (player == null) {
             return;
         }

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

@@ -126,7 +126,7 @@ public class Done extends SubCommand {
         long flagValue = System.currentTimeMillis() / 1000;
         PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(DoneFlag.class)
                 .createFlagInstance(Long.toString(flagValue));
-        PlotFlagAddEvent event = eventDispatcher.callFlagAdd(plotFlag, plot);
+        PlotFlagAddEvent event = new PlotFlagAddEvent(plotFlag, plot);
         if (event.getEventResult() == Result.DENY) {
             player.sendMessage(TranslatableCaption.of("events.event_denied"));
             return;

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

@@ -25,7 +25,6 @@
  */
 package com.plotsquared.core.command;
 
-import com.google.inject.Inject;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.CaptionUtility;
@@ -45,7 +44,6 @@ import com.plotsquared.core.plot.flag.InternalFlag;
 import com.plotsquared.core.plot.flag.PlotFlag;
 import com.plotsquared.core.plot.flag.types.IntegerFlag;
 import com.plotsquared.core.plot.flag.types.ListFlag;
-import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.Permissions;
 import com.plotsquared.core.util.StringComparison;
@@ -81,12 +79,8 @@ import java.util.stream.Stream;
 @SuppressWarnings("unused")
 public final class FlagCommand extends Command {
 
-    private final EventDispatcher eventDispatcher;
-
-    @Inject
-    public FlagCommand(final @NonNull EventDispatcher eventDispatcher) {
+    public FlagCommand() {
         super(MainCommand.getInstance(), true);
-        this.eventDispatcher = eventDispatcher;
     }
 
     private static boolean sendMessage(PlotPlayer<?> player) {
@@ -120,7 +114,7 @@ public final class FlagCommand extends Command {
                             TranslatableCaption.of("permission.no_permission"),
                             Template.of(
                                     "node",
-                                    perm + "." + numeric
+                                    perm
                             )
                     );
                 }
@@ -171,7 +165,7 @@ public final class FlagCommand extends Command {
     /**
      * Checks if the player is allowed to modify the flags at their current location
      *
-     * @return {@code true} if the player is allowed to modify the flags at their current location
+     * @return true if the player is allowed to modify the flags at their current location
      */
     private static boolean checkRequirements(final @NonNull PlotPlayer<?> player) {
         final Location location = player.getLocation();
@@ -341,7 +335,7 @@ public final class FlagCommand extends Command {
             return;
         }
         Plot plot = player.getLocation().getPlotAbs();
-        PlotFlagAddEvent event = eventDispatcher.callFlagAdd(plotFlag, plot);
+        PlotFlagAddEvent event = new PlotFlagAddEvent(plotFlag, plot);
         if (event.getEventResult() == Result.DENY) {
             player.sendMessage(
                     TranslatableCaption.of("events.event_denied"),
@@ -400,7 +394,7 @@ public final class FlagCommand extends Command {
             return;
         }
         Plot plot = player.getLocation().getPlotAbs();
-        PlotFlagAddEvent event = eventDispatcher.callFlagAdd(plotFlag, plot);
+        PlotFlagAddEvent event = new PlotFlagAddEvent(plotFlag, plot);
         if (event.getEventResult() == Result.DENY) {
             player.sendMessage(
                     TranslatableCaption.of("events.event_denied"),
@@ -469,7 +463,7 @@ public final class FlagCommand extends Command {
             return;
         }
         final Plot plot = player.getLocation().getPlotAbs();
-        PlotFlagRemoveEvent event = eventDispatcher.callFlagRemove(flag, plot);
+        PlotFlagRemoveEvent event = new PlotFlagRemoveEvent(flag, plot);
         if (event.getEventResult() == Result.DENY) {
             player.sendMessage(
                     TranslatableCaption.of("events.event_denied"),
@@ -522,7 +516,7 @@ public final class FlagCommand extends Command {
                     }
                 } else {
                     PlotFlag<?, ?> plotFlag = parsedFlag.createFlagInstance(list);
-                    PlotFlagAddEvent addEvent = eventDispatcher.callFlagAdd(plotFlag, plot);
+                    PlotFlagAddEvent addEvent = new PlotFlagAddEvent(plotFlag, plot);
                     if (addEvent.getEventResult() == Result.DENY) {
                         player.sendMessage(
                                 TranslatableCaption.of("events.event_denied"),

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

@@ -37,11 +37,11 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.minimessage.Template;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @CommandDeclaration(command = "help",
         aliases = "?",
@@ -119,9 +119,6 @@ public class Help extends Command {
                 TextComponent.Builder builder = Component.text();
                 builder.append(MINI_MESSAGE.parse(TranslatableCaption.of("help.help_header").getComponent(player)));
                 for (CommandCategory c : CommandCategory.values()) {
-                    if (!c.canAccess(player)) {
-                        continue;
-                    }
                     builder.append(Component.newline()).append(MINI_MESSAGE
                             .parse(
                                     TranslatableCaption.of("help.help_info_item").getComponent(player),
@@ -155,26 +152,12 @@ public class Help extends Command {
 
     @Override
     public Collection<Command> tab(PlotPlayer<?> player, String[] args, boolean space) {
-        final String argument = args[0].toLowerCase(Locale.ENGLISH);
-        List<Command> result = new ArrayList<>();
-
-        for (final CommandCategory category : CommandCategory.values()) {
-            if (!category.canAccess(player)) {
-                continue;
-            }
-            String name = category.name().toLowerCase();
-            if (!name.startsWith(argument)) {
-                continue;
-            }
-            result.add(new Command(null, false, name, "", RequiredType.NONE, null) {
-            });
-        }
-        // add the category "all"
-        if ("all".startsWith(argument)) {
-            result.add(new Command(null, false, "all", "", RequiredType.NONE, null) {
-            });
-        }
-        return result;
+        return Stream.of("claiming", "teleport", "settings", "chat", "schematic", "appearance", "info", "debug",
+                        "administration", "all"
+                )
+                .filter(value -> value.startsWith(args[0].toLowerCase(Locale.ENGLISH)))
+                .map(value -> new Command(null, false, value, "", RequiredType.NONE, null) {
+                }).collect(Collectors.toList());
     }
 
 }

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

@@ -32,7 +32,6 @@ import com.plotsquared.core.configuration.caption.Caption;
 import com.plotsquared.core.configuration.caption.CaptionHolder;
 import com.plotsquared.core.configuration.caption.Templates;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.database.DBFunc;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -40,7 +39,6 @@ import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.expiration.ExpireManager;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 import com.plotsquared.core.plot.flag.implementations.PriceFlag;
-import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.EconHandler;
 import com.plotsquared.core.util.MathMan;
@@ -420,7 +418,7 @@ public class ListCmd extends SubCommand {
                 Caption color;
                 if (plot.getOwner() == null) {
                     color = TranslatableCaption.of("info.plot_list_no_owner");
-                } else if (plot.isOwner(player.getUUID()) || plot.getOwner().equals(DBFunc.EVERYONE)) {
+                } else if (plot.isOwner(player.getUUID())) {
                     color = TranslatableCaption.of("info.plot_list_owned_by");
                 } else if (plot.isAdded(player.getUUID())) {
                     color = TranslatableCaption.of("info.plot_list_added_to");
@@ -458,17 +456,7 @@ public class ListCmd extends SubCommand {
                 String prefix = "";
                 String online = TranslatableCaption.of("info.plot_list_player_online").getComponent(player);
                 String offline = TranslatableCaption.of("info.plot_list_player_offline").getComponent(player);
-                String unknown = TranslatableCaption.of("info.plot_list_player_unknown").getComponent(player);
-                String server = TranslatableCaption.of("info.plot_list_player_server").getComponent(player);
-                String everyone = TranslatableCaption.of("info.plot_list_player_everyone").getComponent(player);
                 TextComponent.Builder builder = Component.text();
-                if (plot.getFlag(ServerPlotFlag.class)) {
-                    Template serverTemplate = Template.of(
-                            "info.server",
-                            TranslatableCaption.of("info.server").getComponent(player)
-                    );
-                    builder.append(MINI_MESSAGE.parse(server, serverTemplate));
-                } else {
                 try {
                     final List<UUIDMapping> names = PlotSquared.get().getImpromptuUUIDPipeline().getNames(plot.getOwners())
                             .get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS);
@@ -478,18 +466,6 @@ public class ListCmd extends SubCommand {
                         Template playerTemplate = Template.of("player", uuidMapping.getUsername());
                         if (pp != null) {
                             builder.append(MINI_MESSAGE.parse(online, prefixTemplate, playerTemplate));
-                            } else if (uuidMapping.getUsername().equalsIgnoreCase("unknown")) {
-                                Template unknownTemplate = Template.of(
-                                        "info.unknown",
-                                        TranslatableCaption.of("info.unknown").getComponent(player)
-                                );
-                                builder.append(MINI_MESSAGE.parse(unknown, unknownTemplate));
-                            } else if (uuidMapping.getUuid().equals(DBFunc.EVERYONE)) {
-                                Template everyoneTemplate = Template.of(
-                                        "info.everyone",
-                                        TranslatableCaption.of("info.everyone").getComponent(player)
-                                );
-                                builder.append(MINI_MESSAGE.parse(everyone, everyoneTemplate));
                         } else {
                             builder.append(MINI_MESSAGE.parse(offline, prefixTemplate, playerTemplate));
                         }
@@ -512,7 +488,6 @@ public class ListCmd extends SubCommand {
                 } catch (TimeoutException e) {
                     player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout"));
                 }
-                }
                 Template players = Template.of("players", builder.asComponent());
                 caption.set(TranslatableCaption.of("info.plot_list_item"));
                 caption.setTemplates(command_tp, command_info, hover_info, numberTemplate, plotTemplate, players);

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

@@ -40,7 +40,6 @@ import com.plotsquared.core.plot.schematic.Schematic;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.Permissions;
 import com.plotsquared.core.util.SchematicHandler;
-import com.plotsquared.core.util.TimeUtil;
 import com.plotsquared.core.util.task.RunnableVal;
 import com.plotsquared.core.util.task.TaskManager;
 import net.kyori.adventure.text.minimessage.Template;
@@ -206,7 +205,7 @@ public class Load extends SubCommand {
                     if (split.length < 5) {
                         continue;
                     }
-                    String time = TimeUtil.secToTime((System.currentTimeMillis() / 1000) - Long.parseLong(split[0]));
+                    String time = secToTime((System.currentTimeMillis() / 1000) - Long.parseLong(split[0]));
                     String world = split[1];
                     PlotId id = PlotId.fromString(split[2] + ';' + split[3]);
                     String size = split[4];
@@ -224,10 +223,6 @@ public class Load extends SubCommand {
         }
     }
 
-    /**
-     * @deprecated Use {@link TimeUtil#secToTime(long)}
-     */
-    @Deprecated(forRemoval = true, since = "6.6.2")
     public String secToTime(long time) {
         StringBuilder toreturn = new StringBuilder();
         if (time >= 33868800) {

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

@@ -38,13 +38,10 @@ import com.plotsquared.core.plot.PlotInventory;
 import com.plotsquared.core.plot.PlotItemStack;
 import com.plotsquared.core.plot.flag.PlotFlag;
 import com.plotsquared.core.plot.flag.implementations.MusicFlag;
-import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.InventoryUtil;
 import com.plotsquared.core.util.Permissions;
-import com.sk89q.worldedit.world.item.ItemType;
 import com.sk89q.worldedit.world.item.ItemTypes;
 import net.kyori.adventure.text.minimessage.Template;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import javax.annotation.Nullable;
 import java.util.Arrays;
@@ -62,16 +59,14 @@ 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"
             );
 
     private final InventoryUtil inventoryUtil;
-    private final EventDispatcher eventDispatcher;
 
     @Inject
-    public Music(final @Nullable InventoryUtil inventoryUtil, final @NonNull EventDispatcher eventDispatcher) {
+    public Music(final @Nullable InventoryUtil inventoryUtil) {
         this.inventoryUtil = inventoryUtil;
-        this.eventDispatcher = eventDispatcher;
     }
 
     @Override
@@ -109,7 +104,7 @@ public class Music extends SubCommand {
                 if (item.getType() == ItemTypes.BEDROCK) {
                     PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(MusicFlag.class)
                             .createFlagInstance(item.getType());
-                    PlotFlagRemoveEvent event = eventDispatcher.callFlagRemove(plotFlag, plot);
+                    PlotFlagRemoveEvent event = new PlotFlagRemoveEvent(plotFlag, plot);
                     if (event.getEventResult() == Result.DENY) {
                         getPlayer().sendMessage(
                                 TranslatableCaption.of("events.event_denied"),
@@ -126,7 +121,7 @@ public class Music extends SubCommand {
                 } else if (item.getName().toLowerCase(Locale.ENGLISH).contains("disc")) {
                     PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(MusicFlag.class)
                             .createFlagInstance(item.getType());
-                    PlotFlagAddEvent event = eventDispatcher.callFlagAdd(plotFlag, plot);
+                    PlotFlagAddEvent event = new PlotFlagAddEvent(plotFlag, plot);
                     if (event.getEventResult() == Result.DENY) {
                         getPlayer().sendMessage(
                                 TranslatableCaption.of("events.event_denied"),
@@ -149,14 +144,8 @@ public class Music extends SubCommand {
         for (final String disc : DISCS) {
             final String name = String.format("<gold>%s</gold>", disc);
             final String[] lore = {TranslatableCaption.of("plotjukebox.click_to_play").getComponent(player)};
-            ItemType type = ItemTypes.get(disc);
-            if (type == null) {
-                continue;
-            }
-            final PlotItemStack item = new PlotItemStack(type, 1, name, lore);
-            if (inv.setItemChecked(index, item)) {
-                index++;
-            }
+            final PlotItemStack item = new PlotItemStack(disc, 1, name, lore);
+            inv.setItem(index++, item);
         }
 
         // Always add the cancel button

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

@@ -51,7 +51,7 @@ public class PluginCmd extends SubCommand {
             player.sendMessage(StaticCaption.of(
                     "<gray>>> </gray><gold><bold>Authors<reset><gray>: </gray><gold>Citymonstret </gold><gray>& </gray><gold>Empire92 </gold><gray>& </gray><gold>MattBDev </gold><gray>& </gray><gold>dordsor21 </gold><gray>& </gray><gold>NotMyFault </gold><gray>& </gray><gold>SirYwell</gold>"));
             player.sendMessage(StaticCaption.of(
-                    "<gray>>> </gray><gold><bold>Wiki<reset><gray>: </gray><gold><click:open_url:https://intellectualsites.github.io/plotsquared-documentation/>https://intellectualsites.github.io/plotsquared-documentation/</gold>"));
+                    "<gray>>> </gray><gold><bold>Wiki<reset><gray>: </gray><gold><click:open_url:https://github.com/IntellectualSites/PlotSquared-Documentation/wiki>https://github.com/IntellectualSites/PlotSquared-Documentation/wiki</gold>"));
             player.sendMessage(StaticCaption.of(
                     "<gray>>> </gray><gold><bold>Discord<reset><gray>: </gray><gold><click:open_url:https://discord.gg/intellectualsites>https://discord.gg/intellectualsites</gold>"));
             player.sendMessage(

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

@@ -50,7 +50,7 @@ import java.util.UUID;
  * @deprecated In favor of "/plot download" (Arkitektonika) and scheduled
  *         for removal within the next major release.
  */
-@Deprecated(forRemoval = true, since = "6.0.9")
+@Deprecated(forRemoval = true)
 @CommandDeclaration(command = "save",
         category = CommandCategory.SCHEMATIC,
         requiredType = RequiredType.NONE,
@@ -104,8 +104,8 @@ public class Save extends SubCommand {
                     TaskManager.runTaskAsync(() -> {
                         String time = (System.currentTimeMillis() / 1000) + "";
                         Location[] corners = plot.getCorners();
-                        corners[0] = corners[0].withY(plot.getArea().getMinBuildHeight());
-                        corners[1] = corners[1].withY(plot.getArea().getMaxBuildHeight());
+                        corners[0] = corners[0].withY(0);
+                        corners[1] = corners[1].withY(255);
                         int size = (corners[1].getX() - corners[0].getX()) + 1;
                         PlotId id = plot.getId();
                         String world1 = plot.getArea().toString().replaceAll(";", "-")

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

@@ -57,12 +57,8 @@ public class SetHome extends SetCommand {
                 Plot base = plot.getBasePlot(false);
                 Location bottom = base.getBottomAbs();
                 Location location = player.getLocationFull();
-                BlockLoc rel = new BlockLoc(
-                        location.getX() - bottom.getX(),
-                        location.getY(), // y is absolute
-                        location.getZ() - bottom.getZ(),
-                        location.getYaw(),
-                        location.getPitch()
+                BlockLoc rel = new BlockLoc(location.getX() - bottom.getX(), location.getY(),
+                        location.getZ() - bottom.getZ(), location.getYaw(), location.getPitch()
                 );
                 base.setHome(rel);
                 player.sendMessage(TranslatableCaption.of("position.position_set"));

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

@@ -180,12 +180,12 @@ public class Trim extends SubCommand {
                             int bx = cbx << 4;
                             int bz = cbz << 4;
                             CuboidRegion region =
-                                    RegionUtil.createRegion(bx, bx + 511, 0, 0, bz, bz + 511);
+                                    RegionUtil.createRegion(bx, bx + 511, bz, bz + 511);
                             for (Plot plot : PlotQuery.newQuery().inWorld(world)) {
                                 Location bot = plot.getBottomAbs();
                                 Location top = plot.getExtendedTopAbs();
                                 CuboidRegion plotReg = RegionUtil
-                                        .createRegion(bot.getX(), top.getX(), 0, 0, bot.getZ(), top.getZ());
+                                        .createRegion(bot.getX(), top.getX(), bot.getZ(), top.getZ());
                                 if (!RegionUtil.intersects(region, plotReg)) {
                                     continue;
                                 }

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

@@ -128,7 +128,7 @@ public class ComponentPresetManager {
                             0,
                             "",
                             "<rainbow:2>Disco Floor</rainbow>",
-                            List.of("<gold>Spice up your plot floor</gold>"),
+                            Arrays.asList("<gold>Spice up your plot floor</gold>"),
                             ItemTypes.YELLOW_WOOL
                     ));
             yamlConfiguration.set("presets", defaultPreset.stream().map(ComponentPreset::serialize).collect(Collectors.toList()));
@@ -181,10 +181,6 @@ public class ComponentPresetManager {
             }
             allowedPresets.add(componentPreset);
         }
-        if (allowedPresets.isEmpty()) {
-            player.sendMessage(TranslatableCaption.of("preset.empty"));
-            return null;
-        }
         final int size = (int) Math.ceil((double) allowedPresets.size() / 9.0D);
         final PlotInventory plotInventory = new PlotInventory(this.inventoryUtil, player, size,
                 TranslatableCaption.of("preset.title").getComponent(player)) {
@@ -214,13 +210,7 @@ public class ComponentPresetManager {
                     return false;
                 }
 
-                if (componentPreset.getCost() > 0.0D) {
-                    if (!econHandler.isEnabled(plot.getArea())) {
-                        getPlayer().sendMessage(
-                                TranslatableCaption.of("preset.economy_disabled"),
-                                Template.of("preset", componentPreset.getDisplayName()));
-                        return false;
-                    }
+                if (componentPreset.getCost() > 0.0D && econHandler.isEnabled(plot.getArea())) {
                     if (econHandler.getMoney(getPlayer()) < componentPreset.getCost()) {
                         getPlayer().sendMessage(TranslatableCaption.of("preset.preset_cannot_afford"));
                         return false;
@@ -256,17 +246,12 @@ 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 (!this.econHandler.isEnabled(plot.getArea())) {
-                    lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.parse(
-                            TranslatableCaption.of("preset.preset_lore_economy_disabled").getComponent(player))));
-                } else {
+            if (preset.getCost() > 0 && this.econHandler.isEnabled(plot.getArea())) {
                 lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.parse(
                         TranslatableCaption.of("preset.preset_lore_cost").getComponent(player),
                         Template.of("cost", String.format("%.2f", preset.getCost()))
                 )));
             }
-            }
             lore.add(MINI_MESSAGE.serialize(MINI_MESSAGE.parse(
                     TranslatableCaption.of("preset.preset_lore_component").getComponent(player),
                     Template.of("component", preset.getComponent().name().toLowerCase()),

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

@@ -73,7 +73,7 @@ public interface ConfigurationSection {
      * has been specified, this will return true.
      *
      * @param path Path to check for existence.
-     * @return {@code true} if this section contains the requested path, either via
+     * @return True if this section contains the requested path, either via
      *         default or being set.
      * @throws IllegalArgumentException Thrown when path is {@code null}.
      */
@@ -87,7 +87,7 @@ public interface ConfigurationSection {
      * has been specified, this will still return false.
      *
      * @param path Path to check for existence.
-     * @return {@code true} if this section contains the requested path, regardless of
+     * @return True if this section contains the requested path, regardless of
      *         having a default.
      * @throws IllegalArgumentException Thrown when path is {@code null}.
      */

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

@@ -44,7 +44,7 @@ public class Settings extends Config {
 
     @Comment("This value is not configurable. It shows the platform you are using.") // This is a comment
     @Final
-    public static String PLATFORM; // These values are set from PlotSquared before loading
+    public static String PLATFORM; // These values are set from P2 before loading
 
     @Comment({"Show additional information in console. It helps us at IntellectualSites to find out more about an issue.",
             "Leave it off if you don't need it, it can spam your console."})
@@ -201,7 +201,7 @@ public class Settings extends Config {
         public List<String> WORLDS = new ArrayList<>(Collections.singletonList("*"));
 
 
-        @Comment("See: https://intellectualsites.github.io/plotsquared-documentation/optimization/plot-analysis for a description of each value.")
+        @Comment("See: https://github.com/IntellectualSites/PlotSquared-Documentation/wiki/Plot-analysis for a description of each value.")
         public static final class CALIBRATION {
 
             public int VARIETY = 0;
@@ -221,7 +221,7 @@ public class Settings extends Config {
 
 
     @Comment({"Chunk processor related settings",
-            "See https://intellectualsites.github.io/plotsquared-documentation/optimization/chunk-processor for more information."})
+            "See https://github.com/IntellectualSites/PlotSquared-Documentation/wiki/Chunk-processor for more information."})
     public static class Chunk_Processor {
 
         @Comment("Auto trim will not save chunks which aren't claimed")
@@ -249,9 +249,6 @@ public class Settings extends Config {
         public static int UUID_CACHE_SIZE = 100000;
         @Comment("Rate limit (per 10 minutes) for background UUID fetching from the Mojang API")
         public static int BACKGROUND_LIMIT = 200;
-        @Comment("Whether the Mojang API service is enabled for impromptu api calls. If false only the Background task will use" +
-                " http requests to fill the UUID cache (requires restart)")
-        public static boolean IMPROMPTU_SERVICE_MOJANG_API = true;
         @Comment("Rate limit (per 10 minutes) for random UUID fetching from the Mojang API")
         public static int IMPROMPTU_LIMIT = 300;
         @Comment("Timeout (in milliseconds) for non-blocking UUID requests (mostly commands)")
@@ -287,7 +284,7 @@ public class Settings extends Config {
         @Comment("Always show explosion Particles, even if explosion flag is set to false")
         public static boolean ALWAYS_SHOW_EXPLOSIONS = false;
         @Comment({"Blocks that may not be used in plot components",
-                "Checkout the wiki article regarding plot components before modifying: https://intellectualsites.github.io/plotsquared-documentation/customization/plot-components"})
+                "Checkout the wiki article regarding plot components before modifying: https://github.com/IntellectualSites/PlotSquared-Documentation/wiki/Plot-Components"})
         public static List<String>
                 INVALID_BLOCKS = Arrays.asList(
                 // Acacia Stuff
@@ -409,7 +406,7 @@ public class Settings extends Config {
 
 
     @Comment({"Schematic Settings",
-            "See https://intellectualsites.github.io/plotsquared-documentation/schematics/schematic-on-claim for more information."})
+            "See https://github.com/IntellectualSites/PlotSquared-Documentation/wiki/Schematic-on-Claim for more information."})
     public static final class Schematics {
 
         @Comment(
@@ -441,7 +438,7 @@ public class Settings extends Config {
     }
 
 
-    @Deprecated(forRemoval = true, since = "6.0.0")
+    @Deprecated(forRemoval = true)
     @Comment("Schematic interface related settings")
     public static class Web {
 
@@ -538,7 +535,7 @@ public class Settings extends Config {
 
 
     @Comment({"Backup related settings",
-            "See https://intellectualsites.github.io/plotsquared-documentation/plot-backups for more information."})
+            "See https://github.com/IntellectualSites/PlotSquared-Documentation/wiki/Backups for more information."})
     public static final class Backup {
 
         @Comment("Automatically backup plots when destructive commands are performed, e.g. /plot clear")
@@ -634,10 +631,10 @@ public class Settings extends Config {
 
     }
 
-    @Comment("Enable or disable all of or parts of the FastAsyncWorldEdit-PlotSquared hook")
+    @Comment("Enable or disable all of or parts of the FAWE-P2 hook")
     public static final class FAWE_Components {
 
-        @Comment("Use FastAsyncWorldEdit for queue handling.")
+        @Comment("Use FAWE for queue handling.")
         public static boolean FAWE_HOOK = true;
         public static boolean CUBOIDS = true;
         public static boolean CLEAR = true;
@@ -694,7 +691,6 @@ public class Settings extends Config {
         @Comment({"If blocks at the edges of queued operations should be set causing updates",
                 " - Slightly slower, but prevents issues such as fences left connected to nothing"})
         public static boolean UPDATE_EDGES = true;
-
     }
 
     @Comment("Settings related to tab completion")
@@ -788,7 +784,7 @@ public class Settings extends Config {
         public static boolean
                 PERSISTENT_ROAD_REGEN = true;
         @Comment({"Enable the `/plot component` preset GUI",
-                "Read more about components here: https://intellectualsites.github.io/plotsquared-documentation/customization/plot-components"})
+                "Read more about components here: https://github.com/IntellectualSites/PlotSquared-Documentation/wiki/Plot-Components"})
         public static boolean COMPONENT_PRESETS = true;
         @Comment("Enable per user locale")
         public static boolean PER_USER_LOCALE = false;

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

@@ -60,7 +60,7 @@ public interface CaptionMap {
      * Check if the map supports a given locale
      *
      * @param locale Locale
-     * @return {@code true} if the map supports the locale
+     * @return True if the map supports the locale
      */
     boolean supportsLocale(final @NonNull Locale locale);
 

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

@@ -103,7 +103,6 @@ public class CaptionUtility {
      * @param miniMessageString the message from which the specified click events should be removed from.
      * @return the string without the click events that are configured to be removed.
      * @see Settings.Chat#CLICK_EVENT_ACTIONS_TO_REMOVE
-     * @since 6.0.10
      */
     public static String stripClickEvents(final @NonNull String miniMessageString) {
         // parse, transform and serialize again
@@ -123,7 +122,6 @@ public class CaptionUtility {
      * @return the string without the click events that are configured to be removed.
      * @see Settings.Chat#CLICK_EVENT_ACTIONS_TO_REMOVE
      * @see #stripClickEvents(String)
-     * @since 6.0.10
      */
     public static String stripClickEvents(
             final @NonNull PlotFlag<?, ?> flag,

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

@@ -99,7 +99,7 @@ public interface ChatFormatter {
          * Whether or not the output should escape
          * any formatting keys
          *
-         * @return {@code true} if raw output is to be used
+         * @return True if raw output is to be used
          */
         public boolean isRawOutput() {
             return this.rawOutput;

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

@@ -39,7 +39,6 @@ public interface ComponentTransform {
      *
      * @param transform the transform to apply.
      * @return a new transform which is applied on all child components and the component itself.
-     * @since 6.0.10
      */
     static ComponentTransform nested(ComponentTransform transform) {
         return new NestedComponentTransform(transform);
@@ -52,7 +51,6 @@ public interface ComponentTransform {
      *
      * @param actionsToRemove the actions used to filter which click events should be removed.
      * @return a new transform that removes click events from a component.
-     * @since 6.0.10
      */
     static ComponentTransform stripClicks(ClickEvent.Action... actionsToRemove) {
         return new ClickStripTransform(Set.of(actionsToRemove));
@@ -63,7 +61,6 @@ public interface ComponentTransform {
      *
      * @param original the component to transform.
      * @return the transformed component.
-     * @since 6.0.10
      */
     @NonNull Component transform(@NonNull Component original);
 

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

@@ -36,12 +36,10 @@ import java.util.Locale;
 public interface LocaleHolder {
 
     /**
-     * Get the console locale holder.
-     * <p>
-     * You can use {@link ConsolePlayer#getConsole()} for direct access to the {@link ConsolePlayer}
-     * </p>
+     * Get the console locale holder
      *
      * @return Console locale holder
+     * @see ConsolePlayer#getConsole() for direct access to the {@link ConsolePlayer}
      */
     @NonNull
     static LocaleHolder console() {

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

@@ -371,7 +371,7 @@ public interface AbstractDB {
     /**
      * Don't use this method unless you want to ruin someone's server.
      *
-     * @return {@code true} if the tables were deleted, {@code false} when an error is encountered
+     * @return true if the tables were deleted, false when an error is encountered
      */
     boolean deleteTables();
 

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

@@ -52,7 +52,7 @@ public abstract class Database {
     /**
      * Checks if a connection is open with the database.
      *
-     * @return {@code true} if the connection is open
+     * @return true if the connection is open
      * @throws SQLException if the connection cannot be checked
      */
     public abstract boolean checkConnection() throws SQLException;
@@ -67,7 +67,7 @@ public abstract class Database {
     /**
      * Closes the connection with the database.
      *
-     * @return {@code true} if successful
+     * @return true if successful
      * @throws SQLException if the connection cannot be closed
      */
     public abstract boolean closeConnection() throws SQLException;

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

@@ -115,7 +115,7 @@ public class PlayerAutoPlotEvent extends PlotEvent implements CancellablePlotEve
     /**
      * @deprecated for removal. Use {@link PlayerAutoPlotEvent#getSizeX()}
      */
-    @Deprecated(forRemoval = true, since = "6.1.0")
+    @Deprecated(forRemoval = true)
     public int getSize_x() {
         return getSizeX();
     }
@@ -123,7 +123,7 @@ public class PlayerAutoPlotEvent extends PlotEvent implements CancellablePlotEve
     /**
      * @deprecated for removal. Use {@link PlayerAutoPlotEvent#setSizeX(int)} )}
      */
-    @Deprecated(forRemoval = true, since = "6.1.0")
+    @Deprecated(forRemoval = true)
     public void setSize_x(int sizeX) {
         setSizeX(sizeX);
     }
@@ -131,7 +131,7 @@ public class PlayerAutoPlotEvent extends PlotEvent implements CancellablePlotEve
     /**
      * @deprecated for removal. Use {@link PlayerAutoPlotEvent#getSizeZ()}
      */
-    @Deprecated(forRemoval = true, since = "6.1.0")
+    @Deprecated(forRemoval = true)
     public int getSize_z() {
         return getSizeZ();
     }
@@ -139,7 +139,7 @@ public class PlayerAutoPlotEvent extends PlotEvent implements CancellablePlotEve
     /**
      * @deprecated for removal. Use {@link PlayerAutoPlotEvent#setSizeZ(int)} )}
      */
-    @Deprecated(forRemoval = true, since = "6.1.0")
+    @Deprecated(forRemoval = true)
     public void setSize_z(int sizeZ) {
         setSizeZ(sizeZ);
     }
@@ -148,7 +148,6 @@ public class PlayerAutoPlotEvent extends PlotEvent implements CancellablePlotEve
      * Get the x size of the auto-area
      *
      * @return x size
-     * @since 6.1.0
      */
     public int getSizeX() {
         return this.sizeX;
@@ -158,7 +157,6 @@ public class PlayerAutoPlotEvent extends PlotEvent implements CancellablePlotEve
      * Set the x size of the auto-area
      *
      * @param sizeX x size
-     * @since 6.1.0
      */
     public void setSizeX(int sizeX) {
         this.sizeX = sizeX;
@@ -168,7 +166,6 @@ public class PlayerAutoPlotEvent extends PlotEvent implements CancellablePlotEve
      * Get the z size of the auto-area
      *
      * @return z size
-     * @since 6.1.0
      */
     public int getSizeZ() {
         return this.sizeZ;
@@ -178,7 +175,6 @@ public class PlayerAutoPlotEvent extends PlotEvent implements CancellablePlotEve
      * Set the z size of the auto-area
      *
      * @param sizeZ z size
-     * @since 6.1.0
      */
     public void setSizeZ(int sizeZ) {
         this.sizeZ = sizeZ;

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

@@ -47,7 +47,6 @@ public class PlayerAutoPlotsChosenEvent extends PlotPlayerEvent {
      *
      * @param player Player that executed the auto
      * @param plots  Plots that have been chosen to be set to the player
-     * @since 6.1.0
      */
     public PlayerAutoPlotsChosenEvent(PlotPlayer<?> player, List<Plot> plots) {
         super(player, plots.size() > 0 ? plots.get(0) : null);
@@ -68,7 +67,6 @@ public class PlayerAutoPlotsChosenEvent extends PlotPlayerEvent {
      * Get the immutable list of plots selected to be claimed by the player. May be of length 0.
      *
      * @return immutable list.
-     * @since 6.1.0
      */
     public @NonNull List<Plot> getPlots() {
         return plots;
@@ -78,7 +76,6 @@ public class PlayerAutoPlotsChosenEvent extends PlotPlayerEvent {
      * Set the plots to be claimed by the player.
      *
      * @param plots list of plots.
-     * @since 6.1.0
      */
     public void setPlots(final @NonNull List<Plot> plots) {
         this.plots = List.copyOf(plots);

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

@@ -42,7 +42,7 @@ public class PlayerPlotDeniedEvent extends PlotEvent {
      * @param initiator Player that initiated the event
      * @param plot      Plot in which the event occurred
      * @param player    Player that was denied/un-denied
-     * @param added     {@code true} of add to deny list, {@code false} if removed
+     * @param added     true of add to deny list, false if removed
      */
     public PlayerPlotDeniedEvent(PlotPlayer<?> initiator, Plot plot, UUID player, boolean added) {
         super(plot);

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

@@ -45,7 +45,7 @@ public class PlayerPlotHelperEvent extends PlotEvent {
      * @param initiator Player that initiated the event
      * @param plot      Plot in which the event occurred
      * @param player    Player that was added/removed from the helper list
-     * @param added     {@code true} if the player was added, {@code false} if the player was removed
+     * @param added     true of the player was added, false if the player was removed
      */
     public PlayerPlotHelperEvent(PlotPlayer<?> initiator, Plot plot, UUID player, boolean added) {
         super(plot);

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

@@ -42,7 +42,7 @@ public class PlayerPlotTrustedEvent extends PlotEvent {
      * @param initiator Player that initiated the event
      * @param plot      Plot in which the event occurred
      * @param player    Player that was added/removed from the trusted list
-     * @param added     {@code true} if the player was added, {@code false} if the player was removed
+     * @param added     true of the player was added, false if the player was removed
      */
     public PlayerPlotTrustedEvent(PlotPlayer<?> initiator, Plot plot, UUID player, boolean added) {
         super(plot);

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

@@ -42,7 +42,7 @@ public class PlayerTeleportToPlotEvent extends PlotPlayerEvent implements Cancel
      * @deprecated use {@link PlayerTeleportToPlotEvent#PlayerTeleportToPlotEvent(PlotPlayer, Location, Plot, TeleportCause)}.
      * You should not be creating events in the first place.
      */
-    @Deprecated(forRemoval = true, since = "6.1.0")
+    @Deprecated(forRemoval = true)
     public PlayerTeleportToPlotEvent(PlotPlayer<?> player, Location from, Plot plot) {
         this(player, from, plot, TeleportCause.UNKNOWN);
     }
@@ -54,7 +54,6 @@ public class PlayerTeleportToPlotEvent extends PlotPlayerEvent implements Cancel
      * @param from   Start location
      * @param plot   Plot to which the player was teleported
      * @param cause  Why the teleport is being completed
-     * @since 6.1.0
      */
     public PlayerTeleportToPlotEvent(PlotPlayer<?> player, Location from, Plot plot, TeleportCause cause) {
         super(player, plot);
@@ -66,7 +65,6 @@ public class PlayerTeleportToPlotEvent extends PlotPlayerEvent implements Cancel
      * Get the teleport cause
      *
      * @return TeleportCause
-     * @since 6.1.0
      */
     public TeleportCause getCause() {
         return cause;

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

@@ -39,7 +39,6 @@ public class PlotClaimedNotifyEvent extends PlotEvent {
      *
      * @param plot Plot that was claimed
      * @param auto If the plot was claimed using /plot auto
-     * @since 6.1.0
      */
     public PlotClaimedNotifyEvent(Plot plot, boolean auto) {
         super(plot);
@@ -50,9 +49,7 @@ public class PlotClaimedNotifyEvent extends PlotEvent {
      * If the plot was claimed using /plot auto
      *
      * @return if claimed with auto
-     * @since 6.1.0
      */
-    @SuppressWarnings("unused")
     public boolean wasAuto() {
         return auto;
     }

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

@@ -57,16 +57,12 @@ public enum TeleportCause {
     PLUGIN,
     UNKNOWN;
 
-    /**
-     * @since 6.1.0
-     */
     public static final class CauseSets {
 
         public static final Set<TeleportCause> COMMAND = Sets.immutableEnumSet(EnumSet.range(
                 TeleportCause.COMMAND,
                 TeleportCause.COMMAND_VISIT
         ));
-        @SuppressWarnings("unused")
         public static final Set<TeleportCause> PLUGIN = Sets.immutableEnumSet(EnumSet.range(
                 TeleportCause.DEATH,
                 TeleportCause.PLUGIN

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

@@ -54,23 +54,12 @@ public class AugmentedUtils {
         enabled = true;
     }
 
-    /**
-     * Generate an augmented world chunk at the given location. If a queue is given, the data will be written to it, else a new
-     * queue will be created and written to world. Returns true if generation occurred.
-     *
-     * @param world  World name to generate data for. Must be a PlotSquared world containing one or more areas else nothing will
-     *               happen.
-     * @param chunkX Chunk X position
-     * @param chunkZ Chunk Z position
-     * @param queue  Queue to write to, if desired.
-     * @return true if generation occurred.
-     * @since 6.8.0
-     */
-    public static boolean generateChunk(
+    public static boolean generate(
+            @Nullable Object chunkObject,
             final @NonNull String world,
             final int chunkX,
             final int chunkZ,
-            @Nullable QueueCoordinator queue
+            QueueCoordinator queue
     ) {
         if (!enabled) {
             return false;
@@ -81,7 +70,7 @@ public class AugmentedUtils {
         final int blockZ = chunkZ << 4;
         // Create a region that contains the
         // entire chunk
-        CuboidRegion region = RegionUtil.createRegion(blockX, blockX + 15, 0, 0, blockZ, blockZ + 15);
+        CuboidRegion region = RegionUtil.createRegion(blockX, blockX + 15, blockZ, blockZ + 15);
         // Query for plot areas in the chunk
         final Set<PlotArea> areas = PlotSquared.get().getPlotAreaManager().getPlotAreasSet(world, region);
         if (areas.isEmpty()) {
@@ -108,6 +97,9 @@ public class AugmentedUtils {
                         .platform()
                         .worldUtil()
                         .getWeWorld(world));
+                if (chunkObject != null) {
+                    queue.setChunkObject(chunkObject);
+                }
             }
             QueueCoordinator primaryMask;
             // coordinates
@@ -130,7 +122,6 @@ public class AugmentedUtils {
             }
             QueueCoordinator secondaryMask;
             BlockState air = BlockTypes.AIR.getDefaultState();
-            int startYOffset = !(area instanceof ClassicPlotWorld) || ((ClassicPlotWorld) area).PLOT_BEDROCK ? 1 : 0;
             if (area.getTerrain() == PlotAreaTerrainType.ROAD) {
                 PlotManager manager = area.getPlotManager();
                 final boolean[][] canPlace = new boolean[16][16];
@@ -141,7 +132,7 @@ public class AugmentedUtils {
                         int worldZ = z + blockZ;
                         boolean can = manager.getPlotId(worldX, 0, worldZ) == null;
                         if (can) {
-                            for (int y = area.getMinGenHeight() + startYOffset; y <= area.getMaxGenHeight(); y++) {
+                            for (int y = 1; y < 128; y++) {
                                 queue.setBlock(worldX, y, worldZ, air);
                             }
                             canPlace[x][z] = true;
@@ -158,24 +149,30 @@ public class AugmentedUtils {
                 secondaryMask = primaryMask;
                 for (int x = relativeBottomX; x <= relativeTopX; x++) {
                     for (int z = relativeBottomZ; z <= relativeTopZ; z++) {
-                        for (int y = area.getMinGenHeight() + startYOffset; y <= area.getMaxGenHeight(); y++) {
+                        for (int y = 1; y < 128; y++) {
                             queue.setBlock(blockX + x, y, blockZ + z, air);
                         }
                     }
                 }
                 generationResult = true;
             }
+            if (chunkObject != null) {
+                primaryMask.setChunkObject(chunkObject);
+            }
+            if (chunkObject != null) {
+                secondaryMask.setChunkObject(chunkObject);
+            }
 
-            // This queue should not be enqueued as it is simply used to restrict block setting, and then delegate to the
-            // actual queue
             ScopedQueueCoordinator scoped =
                     new ScopedQueueCoordinator(
                             secondaryMask,
-                            Location.at(world, blockX, area.getMinGenHeight(), blockZ),
-                            Location.at(world, blockX + 15, area.getMaxGenHeight(), blockZ + 15)
+                            Location.at(world, blockX, 0, blockZ),
+                            Location.at(world, blockX + 15, 255, blockZ + 15)
                     );
             generator.generateChunk(scoped, area);
             generator.populateChunk(scoped, area);
+            scoped.setForceSync(true);
+            scoped.enqueue();
         }
         if (enqueue) {
             queue.enqueue();
@@ -183,19 +180,4 @@ public class AugmentedUtils {
         return generationResult;
     }
 
-    /**
-     * @deprecated Use {@link AugmentedUtils#generateChunk(String, int, int, QueueCoordinator)} as chunkObject is not required
-     * in the above method
-     */
-    @Deprecated(forRemoval = true, since = "6.8.0")
-    public static boolean generate(
-            @Nullable Object chunkObject,
-            final @NonNull String world,
-            final int chunkX,
-            final int chunkZ,
-            QueueCoordinator queue
-    ) {
-        return generateChunk(world, chunkX, chunkZ, queue);
-    }
-
 }

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

@@ -37,6 +37,7 @@ import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotAreaTerrainType;
 import com.plotsquared.core.plot.PlotId;
 import com.plotsquared.core.queue.QueueCoordinator;
+import com.plotsquared.core.util.BlockUtil;
 import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.RegionManager;
 import com.plotsquared.core.util.task.TaskManager;
@@ -146,15 +147,7 @@ public class ClassicPlotManager extends SquarePlotManager {
     ) {
         Plot plot = classicPlotWorld.getPlotAbs(plotId);
         if (plot != null && plot.isBasePlot()) {
-            return this.regionManager.setCuboids(
-                    classicPlotWorld,
-                    plot.getRegions(),
-                    blocks,
-                    classicPlotWorld.getMinBuildHeight(),
-                    classicPlotWorld.getMaxBuildHeight(),
-                    actor,
-                    queue
-            );
+            return this.regionManager.setCuboids(classicPlotWorld, plot.getRegions(), blocks, 1, getWorldHeight(), actor, queue);
         }
         return false;
     }
@@ -182,7 +175,7 @@ public class ClassicPlotManager extends SquarePlotManager {
                             plot.getRegions(),
                             blocks,
                             classicPlotWorld.PLOT_HEIGHT + 1,
-                            classicPlotWorld.getMaxBuildHeight(),
+                            getWorldHeight(),
                             actor,
                             queue
                     );
@@ -211,7 +204,7 @@ public class ClassicPlotManager extends SquarePlotManager {
                     classicPlotWorld,
                     plot.getRegions(),
                     blocks,
-                    classicPlotWorld.getMinBuildHeight(),
+                    1,
                     classicPlotWorld.PLOT_HEIGHT - 1,
                     actor,
                     queue
@@ -288,7 +281,7 @@ public class ClassicPlotManager extends SquarePlotManager {
             }
         }
 
-        int maxY = classicPlotWorld.getMaxBuildHeight();
+        int maxY = classicPlotWorld.getPlotManager().getWorldHeight();
         if (!plot.isMerged(Direction.NORTH)) {
             int z = bottom.getZ();
             for (int x = bottom.getX(); x <= top.getX(); x++) {
@@ -389,7 +382,7 @@ public class ClassicPlotManager extends SquarePlotManager {
         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 = 1; y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }
@@ -397,7 +390,7 @@ public class ClassicPlotManager extends SquarePlotManager {
         if (!plot.isMerged(Direction.WEST)) {
             int x = bot.getX();
             for (int z = bot.getZ(); z < top.getZ(); z++) {
-                for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = 1; y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }
@@ -405,7 +398,7 @@ public class ClassicPlotManager extends SquarePlotManager {
         if (!plot.isMerged(Direction.SOUTH)) {
             int z = top.getZ();
             for (int x = bot.getX(); x < top.getX() + (plot.isMerged(Direction.EAST) ? 0 : 1); x++) {
-                for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = 1; y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }
@@ -413,7 +406,7 @@ public class ClassicPlotManager extends SquarePlotManager {
         if (!plot.isMerged(Direction.EAST)) {
             int x = top.getX();
             for (int z = bot.getZ(); z < top.getZ() + (plot.isMerged(Direction.SOUTH) ? 0 : 1); z++) {
-                for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = 1; y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }
@@ -508,7 +501,7 @@ public class ClassicPlotManager extends SquarePlotManager {
             enqueue = true;
         }
 
-        int maxY = classicPlotWorld.getMaxGenHeight();
+        int maxY = getWorldHeight();
         queue.setCuboid(
                 Location.at(
                         classicPlotWorld.getWorldName(),
@@ -520,26 +513,26 @@ public class ClassicPlotManager extends SquarePlotManager {
         );
         if (classicPlotWorld.PLOT_BEDROCK) {
             queue.setCuboid(
-                    Location.at(classicPlotWorld.getWorldName(), sx, classicPlotWorld.getMinGenHeight(), sz + 1),
-                    Location.at(classicPlotWorld.getWorldName(), ex, classicPlotWorld.getMinGenHeight(), ez - 1),
+                    Location.at(classicPlotWorld.getWorldName(), sx, 0, sz + 1),
+                    Location.at(classicPlotWorld.getWorldName(), ex, 0, ez - 1),
                     BlockTypes.BEDROCK.getDefaultState()
             );
-        }
-        int startYOffset = classicPlotWorld.PLOT_BEDROCK ? 1 : 0;
             queue.setCuboid(
-                Location.at(classicPlotWorld.getWorldName(), ex, classicPlotWorld.getMinGenHeight() + startYOffset, sz + 1),
-                Location.at(classicPlotWorld.getWorldName(), ex, classicPlotWorld.WALL_HEIGHT, ez - 1),
-                classicPlotWorld.WALL_FILLING.toPattern()
-        );
-        queue.setCuboid(
-                Location.at(classicPlotWorld.getWorldName(), sx, classicPlotWorld.getMinGenHeight() + startYOffset, sz + 1),
+                    Location.at(classicPlotWorld.getWorldName(), sx, 1, sz + 1),
                     Location.at(classicPlotWorld.getWorldName(), sx, classicPlotWorld.WALL_HEIGHT, ez - 1),
                     classicPlotWorld.WALL_FILLING.toPattern()
             );
+        } else {
             queue.setCuboid(
-                Location.at(classicPlotWorld.getWorldName(), sx + 1, classicPlotWorld.getMinGenHeight() + startYOffset, sz + 1),
-                Location.at(classicPlotWorld.getWorldName(), ex - 1, classicPlotWorld.ROAD_HEIGHT, ez - 1),
-                classicPlotWorld.ROAD_BLOCK.toPattern()
+                    Location.at(classicPlotWorld.getWorldName(), sx, 0, sz + 1),
+                    Location.at(classicPlotWorld.getWorldName(), sx, classicPlotWorld.WALL_HEIGHT, ez - 1),
+                    classicPlotWorld.WALL_FILLING.toPattern()
+            );
+        }
+        queue.setCuboid(
+                Location.at(classicPlotWorld.getWorldName(), sx, 1, sz + 1),
+                Location.at(classicPlotWorld.getWorldName(), sx, classicPlotWorld.WALL_HEIGHT, ez - 1),
+                classicPlotWorld.WALL_FILLING.toPattern()
         );
 
         if (classicPlotWorld.PLACE_TOP_BLOCK) {
@@ -548,12 +541,24 @@ public class ClassicPlotManager extends SquarePlotManager {
                     Location.at(classicPlotWorld.getWorldName(), sx, classicPlotWorld.WALL_HEIGHT + 1, ez - 1),
                     classicPlotWorld.WALL_BLOCK.toPattern()
             );
+        }
+        queue.setCuboid(
+                Location.at(classicPlotWorld.getWorldName(), ex, 1, sz + 1),
+                Location.at(classicPlotWorld.getWorldName(), ex, classicPlotWorld.WALL_HEIGHT, ez - 1),
+                classicPlotWorld.WALL_FILLING.toPattern()
+        );
+        if (classicPlotWorld.PLACE_TOP_BLOCK) {
             queue.setCuboid(
                     Location.at(classicPlotWorld.getWorldName(), ex, classicPlotWorld.WALL_HEIGHT + 1, sz + 1),
                     Location.at(classicPlotWorld.getWorldName(), ex, classicPlotWorld.WALL_HEIGHT + 1, ez - 1),
                     classicPlotWorld.WALL_BLOCK.toPattern()
             );
         }
+        queue.setCuboid(
+                Location.at(classicPlotWorld.getWorldName(), sx + 1, 1, sz + 1),
+                Location.at(classicPlotWorld.getWorldName(), ex - 1, classicPlotWorld.ROAD_HEIGHT, ez - 1),
+                classicPlotWorld.ROAD_BLOCK.toPattern()
+        );
         return !enqueue || queue.enqueue();
     }
 
@@ -579,32 +584,19 @@ public class ClassicPlotManager extends SquarePlotManager {
                         classicPlotWorld.schematicStartHeight() + 1,
                         sz
                 ),
-                Location.at(classicPlotWorld.getWorldName(), ex - 1, classicPlotWorld.getMaxGenHeight(), ez),
+                Location.at(classicPlotWorld.getWorldName(), ex - 1, classicPlotWorld.getPlotManager().getWorldHeight(), ez),
                 BlockTypes.AIR.getDefaultState()
         );
-        if (classicPlotWorld.PLOT_BEDROCK) {
         queue.setCuboid(
-                    Location.at(classicPlotWorld.getWorldName(), sx + 1, classicPlotWorld.getMinGenHeight(), sz),
-                    Location.at(classicPlotWorld.getWorldName(), ex - 1, classicPlotWorld.getMinGenHeight(), ez),
-                    BlockTypes.BEDROCK.getDefaultState()
+                Location.at(classicPlotWorld.getWorldName(), sx + 1, 0, sz),
+                Location.at(classicPlotWorld.getWorldName(), ex - 1, 0, ez),
+                BlockUtil.get((short) 7, (byte) 0)
         );
-        }
-        int startYOffset = classicPlotWorld.PLOT_BEDROCK ? 1 : 0;
         queue.setCuboid(
-                Location.at(classicPlotWorld.getWorldName(), sx + 1, classicPlotWorld.getMinGenHeight() + startYOffset, sz),
+                Location.at(classicPlotWorld.getWorldName(), sx + 1, 1, sz),
                 Location.at(classicPlotWorld.getWorldName(), ex - 1, classicPlotWorld.WALL_HEIGHT, sz),
                 classicPlotWorld.WALL_FILLING.toPattern()
         );
-        queue.setCuboid(
-                Location.at(classicPlotWorld.getWorldName(), sx + 1, classicPlotWorld.getMinGenHeight() + startYOffset, ez),
-                Location.at(classicPlotWorld.getWorldName(), ex - 1, classicPlotWorld.WALL_HEIGHT, ez),
-                classicPlotWorld.WALL_FILLING.toPattern()
-        );
-        queue.setCuboid(
-                Location.at(classicPlotWorld.getWorldName(), sx + 1, classicPlotWorld.getMinGenHeight() + startYOffset, sz + 1),
-                Location.at(classicPlotWorld.getWorldName(), ex - 1, classicPlotWorld.ROAD_HEIGHT, ez - 1),
-                classicPlotWorld.ROAD_BLOCK.toPattern()
-        );
 
         if (classicPlotWorld.PLACE_TOP_BLOCK) {
             queue.setCuboid(
@@ -612,12 +604,24 @@ public class ClassicPlotManager extends SquarePlotManager {
                     Location.at(classicPlotWorld.getWorldName(), ex - 1, classicPlotWorld.WALL_HEIGHT + 1, sz),
                     classicPlotWorld.WALL_BLOCK.toPattern()
             );
+        }
+        queue.setCuboid(
+                Location.at(classicPlotWorld.getWorldName(), sx + 1, 1, ez),
+                Location.at(classicPlotWorld.getWorldName(), ex - 1, classicPlotWorld.WALL_HEIGHT, ez),
+                classicPlotWorld.WALL_FILLING.toPattern()
+        );
+        if (classicPlotWorld.PLACE_TOP_BLOCK) {
             queue.setCuboid(
                     Location.at(classicPlotWorld.getWorldName(), sx + 1, classicPlotWorld.WALL_HEIGHT + 1, ez),
                     Location.at(classicPlotWorld.getWorldName(), ex - 1, classicPlotWorld.WALL_HEIGHT + 1, ez),
                     classicPlotWorld.WALL_BLOCK.toPattern()
             );
         }
+        queue.setCuboid(
+                Location.at(classicPlotWorld.getWorldName(), sx + 1, 1, sz + 1),
+                Location.at(classicPlotWorld.getWorldName(), ex - 1, classicPlotWorld.ROAD_HEIGHT, ez - 1),
+                classicPlotWorld.ROAD_BLOCK.toPattern()
+        );
         return !enqueue || queue.enqueue();
     }
 
@@ -638,19 +642,14 @@ public class ClassicPlotManager extends SquarePlotManager {
 
         queue.setCuboid(
                 Location.at(classicPlotWorld.getWorldName(), sx + 1, classicPlotWorld.ROAD_HEIGHT + 1, sz + 1),
-                Location.at(classicPlotWorld.getWorldName(), ex - 1, classicPlotWorld.getMaxGenHeight(), ez - 1),
+                Location.at(classicPlotWorld.getWorldName(), ex - 1, classicPlotWorld.getPlotManager().getWorldHeight(), ez - 1),
                 BlockTypes.AIR.getDefaultState()
         );
-        if (classicPlotWorld.PLOT_BEDROCK) {
-            queue.setCuboid(
-                    Location.at(classicPlotWorld.getWorldName(), sx + 1, classicPlotWorld.getMinGenHeight(), sz + 1),
-                    Location.at(classicPlotWorld.getWorldName(), ex - 1, classicPlotWorld.getMinGenHeight(), ez - 1),
-                    BlockTypes.BEDROCK.getDefaultState()
+        queue.setCuboid(Location.at(classicPlotWorld.getWorldName(), sx + 1, 0, sz + 1),
+                Location.at(classicPlotWorld.getWorldName(), ex - 1, 0, ez - 1), BlockUtil.get((short) 7, (byte) 0)
         );
-        }
-        int startYOffset = classicPlotWorld.PLOT_BEDROCK ? 1 : 0;
         queue.setCuboid(
-                Location.at(classicPlotWorld.getWorldName(), sx + 1, classicPlotWorld.getMinGenHeight() + startYOffset, sz + 1),
+                Location.at(classicPlotWorld.getWorldName(), sx + 1, 1, sz + 1),
                 Location.at(classicPlotWorld.getWorldName(), ex - 1, classicPlotWorld.ROAD_HEIGHT, ez - 1),
                 classicPlotWorld.ROAD_BLOCK.toPattern()
         );
@@ -680,12 +679,11 @@ public class ClassicPlotManager extends SquarePlotManager {
                                 classicPlotWorld.schematicStartHeight() + 1,
                                 sz
                         ),
-                        Location.at(classicPlotWorld.getWorldName(), ex, classicPlotWorld.getMaxGenHeight(), ez),
+                        Location.at(classicPlotWorld.getWorldName(), ex, classicPlotWorld.getPlotManager().getWorldHeight(), ez),
                         BlockTypes.AIR.getDefaultState()
                 );
-        int startYOffset = classicPlotWorld.PLOT_BEDROCK ? 1 : 0;
         queue.setCuboid(
-                Location.at(classicPlotWorld.getWorldName(), sx, classicPlotWorld.getMinGenHeight() + startYOffset, sz + 1),
+                Location.at(classicPlotWorld.getWorldName(), sx, 1, sz + 1),
                 Location.at(classicPlotWorld.getWorldName(), ex, classicPlotWorld.PLOT_HEIGHT - 1, ez - 1),
                 classicPlotWorld.MAIN_BLOCK.toPattern()
         );
@@ -721,12 +719,11 @@ public class ClassicPlotManager extends SquarePlotManager {
                                 classicPlotWorld.schematicStartHeight() + 1,
                                 sz
                         ),
-                        Location.at(classicPlotWorld.getWorldName(), ex, classicPlotWorld.getMaxGenHeight(), ez),
+                        Location.at(classicPlotWorld.getWorldName(), ex, classicPlotWorld.getPlotManager().getWorldHeight(), ez),
                         BlockTypes.AIR.getDefaultState()
                 );
-        int startYOffset = classicPlotWorld.PLOT_BEDROCK ? 1 : 0;
         queue.setCuboid(
-                Location.at(classicPlotWorld.getWorldName(), sx + 1, classicPlotWorld.getMinGenHeight() + startYOffset, sz),
+                Location.at(classicPlotWorld.getWorldName(), sx + 1, 1, sz),
                 Location.at(classicPlotWorld.getWorldName(), ex - 1, classicPlotWorld.PLOT_HEIGHT - 1, ez),
                 classicPlotWorld.MAIN_BLOCK.toPattern()
         );
@@ -761,12 +758,11 @@ public class ClassicPlotManager extends SquarePlotManager {
                                 classicPlotWorld.schematicStartHeight() + 1,
                                 sz
                         ),
-                        Location.at(classicPlotWorld.getWorldName(), ex, classicPlotWorld.getMaxGenHeight(), ez),
+                        Location.at(classicPlotWorld.getWorldName(), ex, classicPlotWorld.getPlotManager().getWorldHeight(), ez),
                         BlockTypes.AIR.getDefaultState()
                 );
-        int startYOffset = classicPlotWorld.PLOT_BEDROCK ? 1 : 0;
         queue.setCuboid(
-                Location.at(classicPlotWorld.getWorldName(), sx, classicPlotWorld.getMinGenHeight() + startYOffset, sz),
+                Location.at(classicPlotWorld.getWorldName(), sx, 1, sz),
                 Location.at(classicPlotWorld.getWorldName(), ex, classicPlotWorld.PLOT_HEIGHT - 1, ez),
                 classicPlotWorld.MAIN_BLOCK.toPattern()
         );

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

@@ -127,16 +127,16 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
     public void loadConfiguration(ConfigurationSection config) {
         super.loadConfiguration(config);
         this.PLOT_BEDROCK = config.getBoolean("plot.bedrock");
-        this.PLOT_HEIGHT = Math.min(getMaxGenHeight(), config.getInt("plot.height"));
+        this.PLOT_HEIGHT = Math.min(255, config.getInt("plot.height"));
         this.MAIN_BLOCK = new BlockBucket(config.getString("plot.filling"));
         this.TOP_BLOCK = new BlockBucket(config.getString("plot.floor"));
         this.WALL_BLOCK = new BlockBucket(config.getString("wall.block"));
-        this.ROAD_HEIGHT = Math.min(getMaxGenHeight(), config.getInt("road.height"));
+        this.ROAD_HEIGHT = Math.min(255, config.getInt("road.height"));
         this.ROAD_BLOCK = new BlockBucket(config.getString("road.block"));
         this.WALL_FILLING = new BlockBucket(config.getString("wall.filling"));
-        this.PLACE_TOP_BLOCK = config.getBoolean("wall.place_top_block");
-        this.WALL_HEIGHT = Math.min(getMaxGenHeight() - (PLACE_TOP_BLOCK ? 1 : 0), config.getInt("wall.height"));
+        this.WALL_HEIGHT = Math.min(254, config.getInt("wall.height"));
         this.CLAIMED_WALL_BLOCK = new BlockBucket(config.getString("wall.block_claimed"));
+        this.PLACE_TOP_BLOCK = config.getBoolean("wall.place_top_block");
     }
 
     int schematicStartHeight() {

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

@@ -35,23 +35,13 @@ import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.PlotId;
 import com.plotsquared.core.queue.ScopedQueueCoordinator;
 import com.plotsquared.core.util.MathMan;
-import com.sk89q.worldedit.entity.BaseEntity;
-import com.sk89q.worldedit.entity.Entity;
-import com.sk89q.worldedit.extent.Extent;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.math.Vector3;
-import com.sk89q.worldedit.regions.CuboidRegion;
-import com.sk89q.worldedit.regions.RegionOperationException;
-import com.sk89q.worldedit.world.NullWorld;
 import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockTypes;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class HybridGen extends IndependentPlotGenerator {
 
-    private static final CuboidRegion CHUNK = new CuboidRegion(BlockVector3.ZERO, BlockVector3.at(15, 396, 15));
     private final HybridPlotWorldFactory hybridPlotWorldFactory;
 
     @Inject
@@ -65,17 +55,12 @@ public class HybridGen extends IndependentPlotGenerator {
     }
 
     private void placeSchem(
-            HybridPlotWorld world,
-            ScopedQueueCoordinator result,
-            short relativeX,
-            short relativeZ,
-            int x,
-            int z,
-            boolean isRoad,
-            boolean isPopulating
+            HybridPlotWorld world, ScopedQueueCoordinator result, short relativeX,
+            short relativeZ, int x, int z, boolean isRoad
     ) {
         int minY; // Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT);
-        if ((isRoad && Settings.Schematics.PASTE_ROAD_ON_TOP) || (!isRoad && Settings.Schematics.PASTE_ON_TOP)) {
+        if ((isRoad && Settings.Schematics.PASTE_ROAD_ON_TOP) || (!isRoad
+                && Settings.Schematics.PASTE_ON_TOP)) {
             minY = world.SCHEM_Y;
         } else {
             minY = world.getMinBuildHeight();
@@ -84,12 +69,10 @@ public class HybridGen extends IndependentPlotGenerator {
         if (blocks != null) {
             for (int y = 0; y < blocks.length; y++) {
                 if (blocks[y] != null) {
-                    if (!isPopulating || blocks[y].hasNbtData()) {
                     result.setBlock(x, minY + y, z, blocks[y]);
                 }
             }
         }
-        }
         BiomeType biome = world.G_SCH_B.get(MathMan.pair(relativeX, relativeZ));
         if (biome != null) {
             result.setBiome(x, z, biome);
@@ -108,7 +91,7 @@ public class HybridGen extends IndependentPlotGenerator {
         if (hybridPlotWorld.PLOT_BEDROCK) {
             for (short x = 0; x < 16; x++) {
                 for (short z = 0; z < 16; z++) {
-                    result.setBlock(x, hybridPlotWorld.getMinGenHeight(), z, BlockTypes.BEDROCK.getDefaultState());
+                    result.setBlock(x, 0, z, BlockTypes.BEDROCK.getDefaultState());
                 }
             }
         }
@@ -138,38 +121,42 @@ public class HybridGen extends IndependentPlotGenerator {
         short[] relativeX = new short[16];
         boolean[] insideRoadX = new boolean[16];
         boolean[] insideWallX = new boolean[16];
-        short offsetX = relativeOffsetX;
         for (short i = 0; i < 16; i++) {
-            if (offsetX >= hybridPlotWorld.SIZE) {
-                offsetX -= hybridPlotWorld.SIZE;
+            short v = (short) (relativeOffsetX + i);
+            while (v >= hybridPlotWorld.SIZE) {
+                v -= hybridPlotWorld.SIZE;
             }
-            relativeX[i] = offsetX;
+            relativeX[i] = v;
             if (hybridPlotWorld.ROAD_WIDTH != 0) {
-                insideRoadX[i] = offsetX < hybridPlotWorld.PATH_WIDTH_LOWER || offsetX > hybridPlotWorld.PATH_WIDTH_UPPER;
-                insideWallX[i] = offsetX == hybridPlotWorld.PATH_WIDTH_LOWER || offsetX == hybridPlotWorld.PATH_WIDTH_UPPER;
+                insideRoadX[i] =
+                        v < hybridPlotWorld.PATH_WIDTH_LOWER || v > hybridPlotWorld.PATH_WIDTH_UPPER;
+                insideWallX[i] =
+                        v == hybridPlotWorld.PATH_WIDTH_LOWER || v == hybridPlotWorld.PATH_WIDTH_UPPER;
             }
-            offsetX++;
         }
         // The Z-coordinate of a given Z coordinate, relative to the
         // plot (Counting from the corner with the least positive
         // coordinates)
         short[] relativeZ = new short[16];
+        // Whether or not the given Z coordinate belongs to the road
         boolean[] insideRoadZ = new boolean[16];
+        // Whether or not the given Z coordinate belongs to the wall
         boolean[] insideWallZ = new boolean[16];
-        short offsetZ = relativeOffsetZ;
         for (short i = 0; i < 16; i++) {
-            if (offsetZ >= hybridPlotWorld.SIZE) {
-                offsetZ -= hybridPlotWorld.SIZE;
+            short v = (short) (relativeOffsetZ + i);
+            while (v >= hybridPlotWorld.SIZE) {
+                v -= hybridPlotWorld.SIZE;
             }
-            relativeZ[i] = offsetZ;
+            relativeZ[i] = v;
             if (hybridPlotWorld.ROAD_WIDTH != 0) {
-                insideRoadZ[i] = offsetZ < hybridPlotWorld.PATH_WIDTH_LOWER || offsetZ > hybridPlotWorld.PATH_WIDTH_UPPER;
-                insideWallZ[i] = offsetZ == hybridPlotWorld.PATH_WIDTH_LOWER || offsetZ == hybridPlotWorld.PATH_WIDTH_UPPER;
+                insideRoadZ[i] =
+                        v < hybridPlotWorld.PATH_WIDTH_LOWER || v > hybridPlotWorld.PATH_WIDTH_UPPER;
+                insideWallZ[i] =
+                        v == hybridPlotWorld.PATH_WIDTH_LOWER || v == hybridPlotWorld.PATH_WIDTH_UPPER;
             }
-            offsetZ++;
         }
         // generation
-        int startY = hybridPlotWorld.getMinGenHeight() + (hybridPlotWorld.PLOT_BEDROCK ? 1 : 0);
+        int startY = hybridPlotWorld.PLOT_BEDROCK ? 1 : 0;
         for (short x = 0; x < 16; x++) {
             if (insideRoadX[x]) {
                 for (short z = 0; z < 16; z++) {
@@ -178,7 +165,7 @@ public class HybridGen extends IndependentPlotGenerator {
                         result.setBlock(x, y, z, hybridPlotWorld.ROAD_BLOCK.toPattern());
                     }
                     if (hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
-                        placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true, false);
+                        placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true);
                     }
                 }
             } else if (insideWallX[x]) {
@@ -189,7 +176,9 @@ public class HybridGen extends IndependentPlotGenerator {
                             result.setBlock(x, y, z, hybridPlotWorld.ROAD_BLOCK.toPattern());
                         }
                         if (hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
-                            placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true, false);
+                            placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z,
+                                    true
+                            );
                         }
                     } else {
                         // wall
@@ -198,10 +187,14 @@ public class HybridGen extends IndependentPlotGenerator {
                         }
                         if (!hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
                             if (hybridPlotWorld.PLACE_TOP_BLOCK) {
-                                result.setBlock(x, hybridPlotWorld.WALL_HEIGHT + 1, z, hybridPlotWorld.WALL_BLOCK.toPattern());
+                                result.setBlock(x, hybridPlotWorld.WALL_HEIGHT + 1, z,
+                                        hybridPlotWorld.WALL_BLOCK.toPattern()
+                                );
                             }
                         } else {
-                            placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true, false);
+                            placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z,
+                                    true
+                            );
                         }
                     }
                 }
@@ -213,7 +206,9 @@ public class HybridGen extends IndependentPlotGenerator {
                             result.setBlock(x, y, z, hybridPlotWorld.ROAD_BLOCK.toPattern());
                         }
                         if (hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
-                            placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true, false);
+                            placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z,
+                                    true
+                            );
                         }
                     } else if (insideWallZ[z]) {
                         // wall
@@ -222,19 +217,27 @@ public class HybridGen extends IndependentPlotGenerator {
                         }
                         if (!hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
                             if (hybridPlotWorld.PLACE_TOP_BLOCK) {
-                                result.setBlock(x, hybridPlotWorld.WALL_HEIGHT + 1, z, hybridPlotWorld.WALL_BLOCK.toPattern());
+                                result.setBlock(x, hybridPlotWorld.WALL_HEIGHT + 1, z,
+                                        hybridPlotWorld.WALL_BLOCK.toPattern()
+                                );
                             }
                         } else {
-                            placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true, false);
+                            placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z,
+                                    true
+                            );
                         }
                     } else {
                         // plot
                         for (int y = startY; y < hybridPlotWorld.PLOT_HEIGHT; y++) {
                             result.setBlock(x, y, z, hybridPlotWorld.MAIN_BLOCK.toPattern());
                         }
-                        result.setBlock(x, hybridPlotWorld.PLOT_HEIGHT, z, hybridPlotWorld.TOP_BLOCK.toPattern());
+                        result.setBlock(x, hybridPlotWorld.PLOT_HEIGHT, z,
+                                hybridPlotWorld.TOP_BLOCK.toPattern()
+                        );
                         if (hybridPlotWorld.PLOT_SCHEMATIC) {
-                            placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, false, false);
+                            placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z,
+                                    false
+                            );
                         }
                     }
                 }
@@ -242,138 +245,6 @@ public class HybridGen extends IndependentPlotGenerator {
         }
     }
 
-    @Override
-    public boolean populateChunk(final ScopedQueueCoordinator result, final PlotArea settings) {
-        HybridPlotWorld hybridPlotWorld = (HybridPlotWorld) settings;
-        if (!hybridPlotWorld.populationNeeded()) {
-            return false;
-        }
-        // Coords
-        Location min = result.getMin();
-        int bx = min.getX() - hybridPlotWorld.ROAD_OFFSET_X;
-        int bz = min.getZ() - hybridPlotWorld.ROAD_OFFSET_Z;
-        // The relative X-coordinate (within the plot) of the minimum X coordinate
-        // contained in the scoped queue
-        short relativeOffsetX;
-        if (bx < 0) {
-            relativeOffsetX = (short) (hybridPlotWorld.SIZE + (bx % hybridPlotWorld.SIZE));
-        } else {
-            relativeOffsetX = (short) (bx % hybridPlotWorld.SIZE);
-        }
-        // The relative Z-coordinate (within the plot) of the minimum Z coordinate
-        // contained in the scoped queue
-        short relativeOffsetZ;
-        if (bz < 0) {
-            relativeOffsetZ = (short) (hybridPlotWorld.SIZE + (bz % hybridPlotWorld.SIZE));
-        } else {
-            relativeOffsetZ = (short) (bz % hybridPlotWorld.SIZE);
-        }
-        boolean allRoad = true;
-        boolean overlap = false;
-
-        // The X-coordinate of a given X coordinate, relative to the
-        // plot (Counting from the corner with the least positive
-        // coordinates)
-        short[] relativeX = new short[16];
-        boolean[] insideRoadX = new boolean[16];
-        boolean[] insideWallX = new boolean[16];
-        short offsetX = relativeOffsetX;
-        for (short i = 0; i < 16; i++) {
-            if (offsetX >= hybridPlotWorld.SIZE) {
-                offsetX -= hybridPlotWorld.SIZE;
-                overlap = true;
-            }
-            relativeX[i] = offsetX;
-            if (hybridPlotWorld.ROAD_WIDTH != 0) {
-                boolean insideRoad = offsetX < hybridPlotWorld.PATH_WIDTH_LOWER || offsetX > hybridPlotWorld.PATH_WIDTH_UPPER;
-                boolean insideWall = offsetX == hybridPlotWorld.PATH_WIDTH_LOWER || offsetX == hybridPlotWorld.PATH_WIDTH_UPPER;
-                insideRoadX[i] = insideRoad;
-                insideWallX[i] = insideWall;
-                allRoad &= insideRoad && insideWall;
-            }
-            offsetX++;
-        }
-
-        // The Z-coordinate of a given Z coordinate, relative to the
-        // plot (Counting from the corner with the least positive
-        // coordinates)
-        short[] relativeZ = new short[16];
-        boolean[] insideRoadZ = new boolean[16];
-        boolean[] insideWallZ = new boolean[16];
-        short offsetZ = relativeOffsetZ;
-        for (short i = 0; i < 16; i++) {
-            if (offsetZ >= hybridPlotWorld.SIZE) {
-                offsetZ -= hybridPlotWorld.SIZE;
-                overlap = true;
-            }
-            relativeZ[i] = offsetZ;
-            if (hybridPlotWorld.ROAD_WIDTH != 0) {
-                boolean insideRoad = offsetZ < hybridPlotWorld.PATH_WIDTH_LOWER || offsetZ > hybridPlotWorld.PATH_WIDTH_UPPER;
-                boolean insideWall = offsetZ == hybridPlotWorld.PATH_WIDTH_LOWER || offsetZ == hybridPlotWorld.PATH_WIDTH_UPPER;
-                insideRoadZ[i] = insideRoad;
-                insideWallZ[i] = insideWall;
-                allRoad &= insideRoad && insideWall;
-            }
-            offsetZ++;
-        }
-        for (short x = 0; x < 16; x++) {
-            if (insideRoadX[x] || insideWallX[x]) {
-                if (hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
-                    for (short z = 0; z < 16; z++) {
-                        placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true, true);
-                    }
-                }
-            } else {
-                for (short z = 0; z < 16; z++) {
-                    if (insideRoadZ[z] || insideWallZ[z]) {
-                        if (hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
-                            placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true, true);
-                        }
-                    } else if (hybridPlotWorld.PLOT_SCHEMATIC) {
-                        placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, false, true);
-                    }
-                }
-            }
-        }
-        if (!allRoad && hybridPlotWorld.getPlotSchematicEntities() != null && !hybridPlotWorld
-                .getPlotSchematicEntities()
-                .isEmpty()) {
-            CuboidRegion region = CHUNK.clone();
-            try {
-                region.shift(hybridPlotWorld
-                        .getPlotSchematicMinPoint()
-                        .add(relativeOffsetX, 0, relativeOffsetZ)
-                        .subtract(hybridPlotWorld.PATH_WIDTH_LOWER + 1, 0, hybridPlotWorld.PATH_WIDTH_LOWER + 1));
-                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()))
-                                .add(min.getBlockVector3().withY(hybridPlotWorld.SCHEM_Y).toVector3());
-                        result.setEntity(new PopulatingEntity(
-                                entity,
-                                new com.sk89q.worldedit.util.Location(NullWorld.getInstance(), pos)
-                        ));
-                    }
-                }
-            } catch (RegionOperationException e) {
-                throw new RuntimeException(e);
-            }
-            if (overlap) {
-                try {
-                    region.shift(BlockVector3.at(-hybridPlotWorld.SIZE, 0, -hybridPlotWorld.SIZE));
-                    for (Entity entity : hybridPlotWorld.getPlotSchematicEntities()) {
-                        if (region.contains(entity.getLocation().toVector().toBlockPoint())) {
-                            result.setEntity(entity);
-                        }
-                    }
-                } catch (RegionOperationException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-        return true;
-    }
-
     @Override
     public PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max) {
         return this.hybridPlotWorldFactory.create(world, id, this, min, max);
@@ -384,58 +255,4 @@ public class HybridGen extends IndependentPlotGenerator {
         // All initialization is done in the PlotArea class
     }
 
-    /**
-     * 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.
-     *
-     * @since 6.9.0
-     */
-    private static final class PopulatingEntity implements Entity {
-
-        private final Entity parent;
-        private com.sk89q.worldedit.util.Location location;
-
-        /**
-         * @since 6.9.0
-         */
-        private PopulatingEntity(Entity parent, com.sk89q.worldedit.util.Location location) {
-            this.parent = parent;
-            this.location = location;
-        }
-
-        @Nullable
-        @Override
-        public BaseEntity getState() {
-            return parent.getState();
-        }
-
-        @Override
-        public boolean remove() {
-            return parent.remove();
-        }
-
-        @Override
-        public com.sk89q.worldedit.util.Location getLocation() {
-            return location;
-        }
-
-        @Override
-        public boolean setLocation(final com.sk89q.worldedit.util.Location location) {
-            this.location = location;
-            return true;
-        }
-
-        @Override
-        public Extent getExtent() {
-            return parent.getExtent();
-        }
-
-        @Nullable
-        @Override
-        public <T> T getFacet(final Class<? extends T> cls) {
-            return parent.getFacet(cls);
-        }
-
-    }
-
 }

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

@@ -46,6 +46,7 @@ import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BaseBlock;
+import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockTypes;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -106,32 +107,22 @@ public class HybridPlotManager extends ClassicPlotManager {
 
     @Override
     public boolean createRoadEast(final @NonNull Plot plot, @Nullable QueueCoordinator queue) {
-        boolean enqueue = false;
-        if (queue == null) {
-            queue = hybridPlotWorld.getQueue();
-            enqueue = true;
-        }
         super.createRoadEast(plot, queue);
         PlotId id = plot.getId();
         PlotId id2 = PlotId.of(id.getX() + 1, id.getY());
         Location bot = getPlotBottomLocAbs(id2);
         Location top = getPlotTopLocAbs(id);
-        Location pos1 = Location.at(
-                hybridPlotWorld.getWorldName(),
-                top.getX() + 1,
-                hybridPlotWorld.getMinGenHeight(),
-                bot.getZ() - 1
-        );
-        Location pos2 = Location.at(
-                hybridPlotWorld.getWorldName(),
-                bot.getX(),
-                hybridPlotWorld.getMaxGenHeight(),
-                top.getZ() + 1
-        );
+        Location pos1 = Location.at(hybridPlotWorld.getWorldName(), top.getX() + 1, 0, bot.getZ() - 1);
+        Location pos2 = Location.at(hybridPlotWorld.getWorldName(), bot.getX(), Math.min(getWorldHeight(), 255), top.getZ() + 1);
         this.resetBiome(hybridPlotWorld, pos1, pos2);
         if (!hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
             return true;
         }
+        boolean enqueue = false;
+        if (queue == null) {
+            queue = hybridPlotWorld.getQueue();
+            enqueue = true;
+        }
         createSchemAbs(queue, pos1, pos2, true);
         return !enqueue || queue.enqueue();
     }
@@ -148,7 +139,7 @@ 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(), pos1.getX(), pos1.getZ(), pos2.getX(), pos2.getZ(), biome);
         }
     }
 
@@ -199,38 +190,38 @@ public class HybridPlotManager extends ClassicPlotManager {
 
     @Override
     public boolean createRoadSouth(final @NonNull Plot plot, @Nullable QueueCoordinator queue) {
-        boolean enqueue = false;
-        if (queue == null) {
-            enqueue = true;
-            queue = hybridPlotWorld.getQueue();
-        }
         super.createRoadSouth(plot, queue);
         PlotId id = plot.getId();
         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 pos2 = Location.at(hybridPlotWorld.getWorldName(), top.getX() + 1, hybridPlotWorld.getMaxGenHeight(), bot.getZ());
+        Location pos1 = Location.at(hybridPlotWorld.getWorldName(), bot.getX() - 1, 0, top.getZ() + 1);
+        Location pos2 = Location.at(hybridPlotWorld.getWorldName(), top.getX() + 1, Math.min(getWorldHeight(), 255), bot.getZ());
         this.resetBiome(hybridPlotWorld, pos1, pos2);
         if (!hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
             return true;
         }
+        boolean enqueue = false;
+        if (queue == null) {
+            enqueue = true;
+            queue = hybridPlotWorld.getQueue();
+        }
         createSchemAbs(queue, pos1, pos2, true);
         return !enqueue || queue.enqueue();
     }
 
     @Override
     public boolean createRoadSouthEast(final @NonNull Plot plot, @Nullable QueueCoordinator queue) {
+        super.createRoadSouthEast(plot, queue);
+        PlotId id = plot.getId();
+        PlotId id2 = PlotId.of(id.getX() + 1, id.getY() + 1);
+        Location pos1 = getPlotTopLocAbs(id).add(1, 0, 1).withY(0);
+        Location pos2 = getPlotBottomLocAbs(id2).withY(Math.min(getWorldHeight(), 255));
         boolean enqueue = false;
         if (queue == null) {
             enqueue = true;
             queue = hybridPlotWorld.getQueue();
         }
-        super.createRoadSouthEast(plot, queue);
-        PlotId id = plot.getId();
-        PlotId id2 = PlotId.of(id.getX() + 1, id.getY() + 1);
-        Location pos1 = getPlotTopLocAbs(id).add(1, 0, 1);
-        Location pos2 = getPlotBottomLocAbs(id2);
         createSchemAbs(queue, pos1, pos2, true);
         if (hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
             createSchemAbs(queue, pos1, pos2, true);
@@ -280,23 +271,11 @@ public class HybridPlotManager extends ClassicPlotManager {
             queue.setCompleteTask(whenDone);
         }
         if (!canRegen) {
-            queue.setCuboid(
-                    pos1.withY(hybridPlotWorld.getMinGenHeight()),
-                    pos2.withY(hybridPlotWorld.getMinGenHeight()),
-                    hybridPlotWorld.PLOT_BEDROCK ? bedrock : filling
-            );
+            queue.setCuboid(pos1.withY(0), pos2.withY(0), bedrock);
             // Each component has a different layer
-            queue.setCuboid(
-                    pos1.withY(hybridPlotWorld.getMinGenHeight() + 1),
-                    pos2.withY(hybridPlotWorld.PLOT_HEIGHT - 1),
-                    filling
-            );
+            queue.setCuboid(pos1.withY(1), pos2.withY(hybridPlotWorld.PLOT_HEIGHT - 1), filling);
             queue.setCuboid(pos1.withY(hybridPlotWorld.PLOT_HEIGHT), pos2.withY(hybridPlotWorld.PLOT_HEIGHT), plotfloor);
-            queue.setCuboid(
-                    pos1.withY(hybridPlotWorld.PLOT_HEIGHT + 1),
-                    pos2.withY(hybridPlotWorld.getMaxGenHeight()),
-                    BlockTypes.AIR.getDefaultState()
-            );
+            queue.setCuboid(pos1.withY(hybridPlotWorld.PLOT_HEIGHT + 1), pos2.withY(getWorldHeight()), 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

@@ -40,13 +40,11 @@ import com.plotsquared.core.plot.PlotId;
 import com.plotsquared.core.plot.PlotManager;
 import com.plotsquared.core.plot.schematic.Schematic;
 import com.plotsquared.core.queue.GlobalBlockQueue;
-import com.plotsquared.core.util.AnnotationHelper;
 import com.plotsquared.core.util.FileUtils;
 import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.SchematicHandler;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.CompoundTagBuilder;
-import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.extent.transform.BlockTransformExtent;
 import com.sk89q.worldedit.internal.helper.MCDirections;
@@ -60,13 +58,11 @@ import com.sk89q.worldedit.world.block.BaseBlock;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
+import javax.annotation.Nullable;
 import java.io.File;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Locale;
 
 public class HybridPlotWorld extends ClassicPlotWorld {
@@ -75,7 +71,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;
@@ -84,12 +79,6 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     public int SCHEM_Y;
     private Location SIGN_LOCATION;
     private File root = null;
-    private int lastOverlayHeightError = Integer.MIN_VALUE;
-    private List<Entity> schem3Entities = null;
-    private BlockVector3 schem3MinPoint = null;
-    private boolean schem1PopulationNeeded = false;
-    private boolean schem2PopulationNeeded = false;
-    private boolean schem3PopulationNeeded = false;
 
     @Inject
     private SchematicHandler schematicHandler;
@@ -108,7 +97,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);
@@ -116,7 +104,6 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         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);
@@ -124,6 +111,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         return data;
     }
 
+    // FIXME depends on block ids
+    // Possibly make abstract?
     public static BaseBlock rotate(BaseBlock id) {
 
         CompoundTag tag = id.getNbtData();
@@ -182,9 +171,9 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     public void loadConfiguration(ConfigurationSection config) {
         super.loadConfiguration(config);
         if ((this.ROAD_WIDTH & 1) == 0) {
-            this.PATH_WIDTH_LOWER = (short) (Math.floor(this.ROAD_WIDTH / 2f) - 1);
+            this.PATH_WIDTH_LOWER = (short) (Math.floor(this.ROAD_WIDTH / 2) - 1);
         } else {
-            this.PATH_WIDTH_LOWER = (short) Math.floor(this.ROAD_WIDTH / 2f);
+            this.PATH_WIDTH_LOWER = (short) Math.floor(this.ROAD_WIDTH / 2);
         }
         if (this.ROAD_WIDTH == 0) {
             this.PATH_WIDTH_UPPER = (short) (this.SIZE + 1);
@@ -261,43 +250,32 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         Schematic schematic1 = this.schematicHandler.getSchematic(schematic1File);
         Schematic schematic2 = this.schematicHandler.getSchematic(schematic2File);
         Schematic schematic3 = this.schematicHandler.getSchematic(schematic3File);
-
-        // If the plot schematic contains entities, then they need to be populated upon generation.
-        if (schematic3 != null && !schematic3.getClipboard().getEntities().isEmpty()) {
-            this.schem3Entities = new ArrayList<>(schematic3.getClipboard().getEntities());
-            this.schem3MinPoint = schematic3.getClipboard().getMinimumPoint();
-            this.schem3PopulationNeeded = true;
-        }
-
         int shift = this.ROAD_WIDTH / 2;
-        int oddshift = (this.ROAD_WIDTH & 1);
+        int oddshift = (this.ROAD_WIDTH & 1) == 0 ? 0 : 1;
 
         SCHEM_Y = schematicStartHeight();
         int plotY = PLOT_HEIGHT - SCHEM_Y;
         int minRoadWall = Settings.Schematics.USE_WALL_IN_ROAD_SCHEM_HEIGHT ? Math.min(ROAD_HEIGHT, WALL_HEIGHT) : ROAD_HEIGHT;
         int roadY = minRoadWall - SCHEM_Y;
 
-        int worldHeight = getMaxGenHeight() - getMinGenHeight() + 1;
-
-        // SCHEM_Y should be normalised to the plot "start" height
         if (schematic3 != null) {
-            if (schematic3.getClipboard().getDimensions().getY() == worldHeight) {
+            if (schematic3.getClipboard().getDimensions().getY() == 256) {
                 SCHEM_Y = plotY = 0;
             } else if (!Settings.Schematics.PASTE_ON_TOP) {
-                SCHEM_Y = plotY = getMinBuildHeight() - getMinGenHeight();
+                SCHEM_Y = plotY = getMinBuildHeight();
             }
         }
 
         if (schematic1 != null) {
-            if (schematic1.getClipboard().getDimensions().getY() == worldHeight) {
-                SCHEM_Y = roadY = getMinGenHeight();
-                if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != worldHeight
+            if (schematic1.getClipboard().getDimensions().getY() == 256) {
+                SCHEM_Y = roadY = 0;
+                if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != 256
                         && !Settings.Schematics.PASTE_ON_TOP) {
                     plotY = PLOT_HEIGHT;
                 }
             } else if (!Settings.Schematics.PASTE_ROAD_ON_TOP) {
                 SCHEM_Y = roadY = getMinBuildHeight();
-                if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != worldHeight
+                if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != 256
                         && !Settings.Schematics.PASTE_ON_TOP) {
                     plotY = PLOT_HEIGHT;
                 }
@@ -332,28 +310,19 @@ public class HybridPlotWorld extends ClassicPlotWorld {
             for (short x = 0; x < w3; x++) {
                 for (short z = 0; z < l3; z++) {
                     for (short y = 0; y < h3; y++) {
-                        BaseBlock id = blockArrayClipboard3.getFullBlock(BlockVector3.at(
+                        BaseBlock id =
+                                blockArrayClipboard3.getFullBlock(BlockVector3.at(
                                         x + min.getBlockX(),
                                         y + min.getBlockY(),
                                         z + min.getBlockZ()
                                 ));
                         if (!id.getBlockType().getMaterial().isAir()) {
-                            schem3PopulationNeeded |= id.hasNbtData();
-                            addOverlayBlock(
-                                    (short) (x + shift + oddshift + centerShiftX),
-                                    (short) (y + plotY),
-                                    (short) (z + shift + oddshift + centerShiftZ),
-                                    id,
-                                    false,
-                                    h3
+                            addOverlayBlock((short) (x + shift + oddshift + centerShiftX), (short) (y + plotY),
+                                    (short) (z + shift + oddshift + centerShiftZ), id, false, h3
                             );
                         }
                     }
-                    if (blockArrayClipboard3.hasBiomes()) {
-                        BiomeType biome = blockArrayClipboard3.getBiome(BlockVector2.at(
-                                x + min.getBlockX(),
-                                z + min.getBlockZ()
-                        ));
+                    BiomeType biome = blockArrayClipboard3.getBiome(BlockVector2.at(x + min.getBlockX(), z + min.getBlockZ()));
                     addOverlayBiome(
                             (short) (x + shift + oddshift + centerShiftX),
                             (short) (z + shift + oddshift + centerShiftZ),
@@ -361,13 +330,12 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                     );
                 }
             }
-            }
 
             if (Settings.DEBUG) {
                 LOGGER.info("- plot schematic: {}", schematic3File.getPath());
             }
         }
-        if ((schematic1 == null && schematic2 == null) || this.ROAD_WIDTH == 0) {
+        if ((schematic1 == null&& schematic2 == null) || this.ROAD_WIDTH == 0) {
             if (Settings.DEBUG) {
                 LOGGER.info("- schematic: false");
             }
@@ -398,7 +366,6 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                             z + min.getBlockZ()
                     ));
                     if (!id.getBlockType().getMaterial().isAir()) {
-                        schem1PopulationNeeded |= id.hasNbtData();
                         addOverlayBlock((short) (x - shift), (short) (y + roadY), (short) (z + shift + oddshift), id, false, h1);
                         addOverlayBlock(
                                 (short) (z + shift + oddshift),
@@ -410,13 +377,11 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                         );
                     }
                 }
-                if (blockArrayClipboard1.hasBiomes()) {
                 BiomeType biome = blockArrayClipboard1.getBiome(BlockVector2.at(x + min.getBlockX(), z + min.getBlockZ()));
                 addOverlayBiome((short) (x - shift), (short) (z + shift + oddshift), biome);
                 addOverlayBiome((short) (z + shift + oddshift), (short) (shift - x + (oddshift - 1)), biome);
             }
         }
-        }
 
         Clipboard blockArrayClipboard2 = schematic2.getClipboard();
         BlockVector3 d2 = blockArrayClipboard2.getDimensions();
@@ -437,17 +402,14 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                             z + min.getBlockZ()
                     ));
                     if (!id.getBlockType().getMaterial().isAir()) {
-                        schem2PopulationNeeded |= id.hasNbtData();
                         addOverlayBlock((short) (x - shift), (short) (y + roadY), (short) (z - shift), id, false, h2);
                     }
                 }
-                if (blockArrayClipboard2.hasBiomes()) {
                 BiomeType biome = blockArrayClipboard2.getBiome(BlockVector2.at(x + min.getBlockX(), z + min.getBlockZ()));
                 addOverlayBiome((short) (x - shift), (short) (z - shift), biome);
             }
         }
     }
-    }
 
     public void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate, int height) {
         if (z < 0) {
@@ -466,10 +428,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         int pair = MathMan.pair(x, z);
         BaseBlock[] existing = this.G_SCH.computeIfAbsent(pair, k -> new BaseBlock[height]);
         if (y >= height) {
-            if (y != lastOverlayHeightError) {
-                lastOverlayHeightError = y;
-                LOGGER.error(String.format("Error adding overlay block. `y > height`. y=%s, height=%s", y, height));
-            }
+            LOGGER.error("Error adding overlay block. `y > height`");
             return;
         }
         existing[y] = id;
@@ -490,52 +449,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         this.G_SCH_B.put(pair, id);
     }
 
-    /**
-     * Get the entities contained within the plot schematic for generation. Intended for internal use only.
-     *
-     * @since 6.9.0
-     */
-    @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.")
-    public @Nullable List<Entity> getPlotSchematicEntities() {
-        return schem3Entities;
-    }
-
-    /**
-     * Get the minimum point of the plot schematic for generation. Intended for internal use only.
-     *
-     * @since 6.9.0
-     */
-    @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.")
-    public @Nullable BlockVector3 getPlotSchematicMinPoint() {
-        return schem3MinPoint;
-    }
-
-    /**
-     * Get if post-generation population of chunks with tiles/entities is needed for this world. Not for public API use.
-     *
-     * @since 6.9.0
-     */
-    @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.")
-    public boolean populationNeeded() {
-        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()}
-     *
-     * @since 6.9.0
-     */
-    public @Nullable File getSchematicRoot() {
-        return this.root;
-    }
-
 }

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

@@ -41,11 +41,10 @@ import com.plotsquared.core.plot.flag.GlobalFlagContainer;
 import com.plotsquared.core.plot.flag.PlotFlag;
 import com.plotsquared.core.plot.flag.implementations.AnalysisFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
-import com.plotsquared.core.queue.BlockArrayCacheScopedQueueCoordinator;
+import com.plotsquared.core.queue.ChunkQueueCoordinator;
 import com.plotsquared.core.queue.GlobalBlockQueue;
 import com.plotsquared.core.queue.QueueCoordinator;
 import com.plotsquared.core.util.ChunkManager;
-import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.RegionManager;
 import com.plotsquared.core.util.RegionUtil;
@@ -65,7 +64,6 @@ import com.sk89q.worldedit.world.block.BlockTypes;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.io.File;
 import java.util.ArrayDeque;
@@ -74,7 +72,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -83,14 +80,11 @@ import java.util.concurrent.atomic.AtomicInteger;
 public class HybridUtils {
 
     private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + HybridUtils.class.getSimpleName());
-    private static final BlockState AIR = BlockTypes.AIR.getDefaultState();
 
     public static HybridUtils manager;
     public static Set<BlockVector2> regions;
     public static int height;
-    // Use ordered for reasonable chunk loading order to reduce paper unloading neighbour chunks and then us attempting to load
-    // them again, causing errors
-    public static Set<BlockVector2> chunks = new LinkedHashSet<>();
+    public static Set<BlockVector2> chunks = new HashSet<>();
     public static PlotArea area;
     public static boolean UPDATE = false;
 
@@ -99,7 +93,6 @@ public class HybridUtils {
     private final GlobalBlockQueue blockQueue;
     private final WorldUtil worldUtil;
     private final SchematicHandler schematicHandler;
-    private final EventDispatcher eventDispatcher;
 
     @Inject
     public HybridUtils(
@@ -107,15 +100,13 @@ public class HybridUtils {
             final @NonNull ChunkManager chunkManager,
             final @NonNull GlobalBlockQueue blockQueue,
             final @NonNull WorldUtil worldUtil,
-            final @NonNull SchematicHandler schematicHandler,
-            final @NonNull EventDispatcher eventDispatcher
+            final @NonNull SchematicHandler schematicHandler
     ) {
         this.plotAreaManager = plotAreaManager;
         this.chunkManager = chunkManager;
         this.blockQueue = blockQueue;
         this.worldUtil = worldUtil;
         this.schematicHandler = schematicHandler;
-        this.eventDispatcher = eventDispatcher;
     }
 
     public void regeneratePlotWalls(final PlotArea area) {
@@ -137,11 +128,6 @@ public class HybridUtils {
          *
          */
         TaskManager.runTaskAsync(() -> {
-            final PlotArea area = this.plotAreaManager.getPlotArea(world, null);
-            if (!(area instanceof HybridPlotWorld hpw)) {
-                return;
-            }
-
             final BlockVector3 bot = region.getMinimumPoint();
             final BlockVector3 top = region.getMaximumPoint();
 
@@ -155,31 +141,38 @@ public class HybridUtils {
             final int ctz = tz >> 4;
             final int width = tx - bx + 1;
             final int length = tz - bz + 1;
-            final int height = area.getMaxGenHeight() - area.getMinGenHeight() + 1;
-            final int minHeight = area.getMinGenHeight();
 
-            final BlockState[][][] newBlocks = new BlockState[height][width][length];
+            final PlotArea area = this.plotAreaManager.getPlotArea(world, null);
 
-            BlockArrayCacheScopedQueueCoordinator oldBlockQueue = new BlockArrayCacheScopedQueueCoordinator(
-                    Location.at("", region.getMinimumPoint().withY(hpw.getMinGenHeight())),
-                    Location.at("", region.getMaximumPoint().withY(hpw.getMaxGenHeight()))
-            );
+            if (!(area instanceof HybridPlotWorld hpw)) {
+                return;
+            }
 
-            region.getChunks().forEach(chunkPos -> {
-                int relChunkX = chunkPos.getX() - cbx;
-                int relChunkZ = chunkPos.getZ() - cbz;
-                oldBlockQueue.setOffsetX(relChunkX << 4);
-                oldBlockQueue.setOffsetZ(relChunkZ << 4);
-                hpw.getGenerator().generateChunk(oldBlockQueue, hpw);
-            });
+            ChunkQueueCoordinator chunk = new ChunkQueueCoordinator(worldUtil.getWeWorld(world), bot, top, false);
+            hpw.getGenerator().generateChunk(chunk, hpw);
 
-            final BlockState[][][] oldBlocks = oldBlockQueue.getBlockStates();
+            final BlockState airBlock = BlockTypes.AIR.getDefaultState();
+            final BlockState[][][] oldBlocks = chunk.getBlocks();
+            final BlockState[][][] newBlocks = new BlockState[256][width][length];
+            for (final BlockState[][] newBlock : newBlocks) {
+                for (final BlockState[] blockStates : newBlock) {
+                    Arrays.fill(blockStates, airBlock);
+                }
+            }
+            for (final BlockState[][] oldBlock : oldBlocks) {
+                for (final BlockState[] blockStates : oldBlock) {
+                    Arrays.fill(blockStates, airBlock);
+                }
+            }
+
+            System.gc();
+            System.gc();
 
             QueueCoordinator queue = area.getQueue();
             queue.addReadChunks(region.getChunks());
-            queue.setChunkConsumer(chunkPos -> {
-                int X = chunkPos.getX();
-                int Z = chunkPos.getZ();
+            queue.setChunkConsumer(blockVector2 -> {
+                int X = blockVector2.getX();
+                int Z = blockVector2.getZ();
                 int minX;
                 if (X == cbx) {
                     minX = bx & 15;
@@ -214,15 +207,11 @@ public class HybridUtils {
                     int xx = chunkBlockX + x;
                     for (int z = minZ; z <= maxZ; z++) {
                         int zz = chunkBlockZ + z;
-                        for (int yIndex = 0; yIndex < height; yIndex++) {
-                            int y = yIndex + minHeight;
+                        for (int y = 0; y < 256; y++) {
                             BlockState block = queue.getBlock(xx, y, zz);
-                            if (block == null) {
-                                block = AIR;
-                            }
                             int xr = xb + x;
                             int zr = zb + z;
-                            newBlocks[yIndex][xr][zr] = block;
+                            newBlocks[y][xr][zr] = block;
                         }
                     }
                 }
@@ -239,11 +228,11 @@ public class HybridUtils {
                 for (int x = 0; x < width; x++) {
                     for (int z = 0; z < length; z++) {
                         Set<BlockType> types = new HashSet<>();
-                        for (int yIndex = 0; yIndex < height; yIndex++) {
-                            BlockState old = oldBlocks[yIndex][x][z]; // Nullable
+                        for (int y = 0; y < 256; y++) {
+                            BlockState old = oldBlocks[y][x][z];
                             try {
-                                BlockState now = newBlocks[yIndex][x][z]; // Not null
-                                if (!now.equals(old) && !(old == null && now.getBlockType().equals(BlockTypes.AIR))) {
+                                BlockState now = newBlocks[y][x][z];
+                                if (!old.equals(now)) {
                                     changes[i]++;
                                 }
                                 if (now.getBlockType().getMaterial().isAir()) {
@@ -251,23 +240,23 @@ public class HybridUtils {
                                 } else {
                                     // check vertices
                                     // modifications_adjacent
-                                    if (x > 0 && z > 0 && yIndex > 0 && x < width - 1 && z < length - 1 && yIndex < (height - 1)) {
-                                        if (newBlocks[yIndex - 1][x][z].getBlockType().getMaterial().isAir()) {
+                                    if (x > 0 && z > 0 && y > 0 && x < width - 1 && z < length - 1 && y < 255) {
+                                        if (newBlocks[y - 1][x][z].getBlockType().getMaterial().isAir()) {
                                             faces[i]++;
                                         }
-                                        if (newBlocks[yIndex][x - 1][z].getBlockType().getMaterial().isAir()) {
+                                        if (newBlocks[y][x - 1][z].getBlockType().getMaterial().isAir()) {
                                             faces[i]++;
                                         }
-                                        if (newBlocks[yIndex][x][z - 1].getBlockType().getMaterial().isAir()) {
+                                        if (newBlocks[y][x][z - 1].getBlockType().getMaterial().isAir()) {
                                             faces[i]++;
                                         }
-                                        if (newBlocks[yIndex + 1][x][z].getBlockType().getMaterial().isAir()) {
+                                        if (newBlocks[y + 1][x][z].getBlockType().getMaterial().isAir()) {
                                             faces[i]++;
                                         }
-                                        if (newBlocks[yIndex][x + 1][z].getBlockType().getMaterial().isAir()) {
+                                        if (newBlocks[y][x + 1][z].getBlockType().getMaterial().isAir()) {
                                             faces[i]++;
                                         }
-                                        if (newBlocks[yIndex][x][z + 1].getBlockType().getMaterial().isAir()) {
+                                        if (newBlocks[y][x][z + 1].getBlockType().getMaterial().isAir()) {
                                             faces[i]++;
                                         }
                                     }
@@ -301,6 +290,8 @@ public class HybridUtils {
                 analysis.data_sd = (int) (MathMan.getSD(data, analysis.data) * 100);
                 analysis.air_sd = (int) (MathMan.getSD(air, analysis.air) * 100);
                 analysis.variety_sd = (int) (MathMan.getSD(variety, analysis.variety) * 100);
+                System.gc();
+                System.gc();
                 whenDone.value = analysis;
                 whenDone.run();
             });
@@ -357,7 +348,7 @@ public class HybridUtils {
                     result.add(whenDone.value.variety_sd);
                     PlotFlag<?, ?> plotFlag = GlobalFlagContainer.getInstance().getFlag(AnalysisFlag.class).createFlagInstance(
                             result);
-                    PlotFlagAddEvent event = eventDispatcher.callFlagAdd(plotFlag, origin);
+                    PlotFlagAddEvent event = new PlotFlagAddEvent(plotFlag, origin);
                     if (event.getEventResult() == Result.DENY) {
                         return;
                     }
@@ -413,7 +404,7 @@ public class HybridUtils {
         }
         HybridUtils.UPDATE = true;
         Set<BlockVector2> regions = this.worldUtil.getChunkChunks(area.getWorldName());
-        return scheduleRoadUpdate(area, regions, extend, new LinkedHashSet<>());
+        return scheduleRoadUpdate(area, regions, extend, new HashSet<>());
     }
 
     public boolean scheduleSingleRegionRoadUpdate(Plot plot, int extend) {
@@ -423,7 +414,7 @@ public class HybridUtils {
         HybridUtils.UPDATE = true;
         Set<BlockVector2> regions = new HashSet<>();
         regions.add(RegionManager.getRegion(plot.getCenterSynchronous()));
-        return scheduleRoadUpdate(plot.getArea(), regions, extend, new LinkedHashSet<>());
+        return scheduleRoadUpdate(plot.getArea(), regions, extend, new HashSet<>());
     }
 
     public boolean scheduleRoadUpdate(
@@ -436,29 +427,26 @@ public class HybridUtils {
         HybridUtils.area = area;
         HybridUtils.height = extend;
         HybridUtils.chunks = chunks;
-        final int initial = 1024 * regions.size() + chunks.size();
         final AtomicInteger count = new AtomicInteger(0);
         TaskManager.runTask(new Runnable() {
             @Override
             public void run() {
                 if (!UPDATE) {
                     Iterator<BlockVector2> iter = chunks.iterator();
-                    QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName()));
                     while (iter.hasNext()) {
                         BlockVector2 chunk = iter.next();
                         iter.remove();
-                        boolean regenedRoad = regenerateRoad(area, chunk, extend, queue);
+                        boolean regenedRoad = regenerateRoad(area, chunk, extend);
                         if (!regenedRoad) {
-                            LOGGER.info("Failed to regenerate roads in chunk {}", chunk);
+                            LOGGER.info("Failed to regenerate roads");
                         }
                     }
-                    queue.enqueue();
                     LOGGER.info("Cancelled road task");
                     return;
                 }
                 count.incrementAndGet();
-                if (count.intValue() % 10 == 0) {
-                    LOGGER.info("Progress: {}%", 100 * (initial - (chunks.size() + 1024 * regions.size())) / initial);
+                if (count.intValue() % 20 == 0) {
+                    LOGGER.info("Progress: {}%", 100 * (2048 - chunks.size()) / 2048);
                 }
                 if (HybridUtils.regions.isEmpty() && chunks.isEmpty()) {
                     regeneratePlotWalls(area);
@@ -470,7 +458,7 @@ public class HybridUtils {
                     final Runnable task = this;
                     TaskManager.runTaskAsync(() -> {
                         try {
-                            if (chunks.size() < 64) {
+                            if (chunks.size() < 1024) {
                                 if (!HybridUtils.regions.isEmpty()) {
                                     Iterator<BlockVector2> iterator = HybridUtils.regions.iterator();
                                     BlockVector2 loc = iterator.next();
@@ -483,35 +471,18 @@ public class HybridUtils {
                             }
                             if (!chunks.isEmpty()) {
                                 TaskManager.getPlatformImplementation().sync(() -> {
+                                    long start = System.currentTimeMillis();
                                     Iterator<BlockVector2> iterator = chunks.iterator();
-                                    if (chunks.size() >= 32) {
-                                        QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName()));
-                                        for (int i = 0; i < 32; i++) {
+                                    while (System.currentTimeMillis() - start < 20 && !chunks.isEmpty()) {
                                         final BlockVector2 chunk = iterator.next();
                                         iterator.remove();
-                                            boolean regenedRoads = regenerateRoad(area, chunk, extend, queue);
+                                        boolean regenedRoads = regenerateRoad(area, chunk, extend);
                                         if (!regenedRoads) {
-                                                LOGGER.info("Failed to regenerate the road in chunk {}", chunk);
+                                            LOGGER.info("Failed to regenerate road");
                                         }
                                     }
-                                        queue.setCompleteTask(task);
-                                        queue.enqueue();
-                                        return null;
-                                    }
-                                    QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName()));
-                                    while (!chunks.isEmpty()) {
-                                        final BlockVector2 chunk = iterator.next();
-                                        iterator.remove();
-                                        boolean regenedRoads = regenerateRoad(area, chunk, extend, queue);
-                                        if (!regenedRoads) {
-                                            LOGGER.info("Failed to regenerate road in chunk {}", chunk);
-                                        }
-                                    }
-                                    queue.setCompleteTask(task);
-                                    queue.enqueue();
                                     return null;
                                 });
-                                return;
                             }
                         } catch (Exception e) {
                             e.printStackTrace();
@@ -539,6 +510,7 @@ public class HybridUtils {
         Location bot = plot.getBottomAbs().subtract(1, 0, 1);
         Location top = plot.getTopAbs();
         final HybridPlotWorld plotworld = (HybridPlotWorld) plot.getArea();
+        PlotManager plotManager = plotworld.getPlotManager();
         // Do not use plotworld#schematicStartHeight() here as we want to restore the pre 6.1.4 way of doing it if
         //  USE_WALL_IN_ROAD_SCHEM_HEIGHT is false
         int schemY = Settings.Schematics.USE_WALL_IN_ROAD_SCHEM_HEIGHT ?
@@ -548,10 +520,10 @@ public class HybridUtils {
         int sy = Settings.Schematics.PASTE_ROAD_ON_TOP ? schemY : plot.getArea().getMinBuildHeight();
         int ex = bot.getX();
         int ez = top.getZ();
-        int ey = get_ey(plotworld, queue, sx, ex, sz, ez, sy);
+        int ey = get_ey(plotManager, queue, sx, ex, sz, ez, sy);
         int bz = sz - plotworld.ROAD_WIDTH;
         int tz = sz - 1;
-        int ty = get_ey(plotworld, queue, sx, ex, bz, tz, sy);
+        int ty = get_ey(plotManager, queue, sx, ex, bz, tz, sy);
 
         final Set<CuboidRegion> sideRoad = Collections.singleton(RegionUtil.createRegion(sx, ex, sy, ey, sz, ez));
         final Set<CuboidRegion> intersection = Collections.singleton(RegionUtil.createRegion(sx, ex, sy, ty, bz, tz));
@@ -577,11 +549,11 @@ public class HybridUtils {
         return true;
     }
 
-    private int get_ey(final HybridPlotWorld hpw, QueueCoordinator queue, int sx, int ex, int sz, int ez, int sy) {
+    public int get_ey(final PlotManager pm, QueueCoordinator queue, int sx, int ex, int sz, int ez, int sy) {
         int ey = sy;
         for (int x = sx; x <= ex; x++) {
             for (int z = sz; z <= ez; z++) {
-                for (int y = sy; y <= hpw.getMaxGenHeight(); y++) {
+                for (int y = sy; y <= pm.getWorldHeight(); y++) {
                     if (y > ey) {
                         BlockState block = queue.getBlock(x, y, z);
                         if (!block.getBlockType().getMaterial().isAir()) {
@@ -594,36 +566,7 @@ public class HybridUtils {
         return ey;
     }
 
-    /**
-     * Regenerate the road in a chunk in a plot area.
-     *
-     * @param area   Plot area to regenerate road for
-     * @param chunk  Chunk location to regenerate
-     * @param extend How far to extend setting air above the road
-     * @return if successful
-     * @deprecated use {@link HybridUtils#regenerateRoad(PlotArea, BlockVector2, int, QueueCoordinator)}
-     */
-    @Deprecated(forRemoval = true, since = "6.6.0")
     public boolean regenerateRoad(final PlotArea area, final BlockVector2 chunk, int extend) {
-        return regenerateRoad(area, chunk, extend, null);
-    }
-
-    /**
-     * Regenerate the road in a chunk in a plot area.
-     *
-     * @param area             Plot area to regenerate road for
-     * @param chunk            Chunk location to regenerate
-     * @param extend           How far to extend setting air above the road
-     * @param queueCoordinator {@link QueueCoordinator} to use to set the blocks. Null if one should be created and enqueued
-     * @return if successful
-     * @since 6.6.0
-     */
-    public boolean regenerateRoad(
-            final PlotArea area,
-            final BlockVector2 chunk,
-            int extend,
-            @Nullable QueueCoordinator queueCoordinator
-    ) {
         int x = chunk.getX() << 4;
         int z = chunk.getZ() << 4;
         int ex = x + 15;
@@ -649,16 +592,9 @@ public class HybridUtils {
         z -= plotWorld.ROAD_OFFSET_Z;
         final int finalX = x;
         final int finalZ = z;
-        final boolean enqueue;
-        final QueueCoordinator queue;
-        if (queueCoordinator == null) {
-            queue = this.blockQueue.getNewQueue(worldUtil.getWeWorld(plotWorld.getWorldName()));
-            enqueue = true;
-        } else {
-            queue = queueCoordinator;
-            enqueue = false;
-        }
+        QueueCoordinator queue = this.blockQueue.getNewQueue(worldUtil.getWeWorld(plotWorld.getWorldName()));
         if (id1 == null || id2 == null || id1 != id2) {
+            this.chunkManager.loadChunk(area.getWorldName(), chunk, false).thenRun(() -> {
                 if (id1 != null) {
                     Plot p1 = area.getPlotAbs(id1);
                     if (p1 != null && p1.hasOwner() && p1.isMerged()) {
@@ -671,7 +607,7 @@ public class HybridUtils {
                         toCheck.set(true);
                     }
                 }
-            short size = plotWorld.SIZE;
+                int size = plotWorld.SIZE;
                 for (int X = 0; X < 16; X++) {
                     short absX = (short) ((finalX + X) % size);
                     for (int Z = 0; Z < 16; Z++) {
@@ -698,29 +634,29 @@ public class HybridUtils {
                         }
                         if (condition) {
                             BaseBlock[] blocks = plotWorld.G_SCH.get(MathMan.pair(absX, absZ));
-                        int minY = Settings.Schematics.PASTE_ROAD_ON_TOP ? plotWorld.SCHEM_Y : area.getMinGenHeight() + 1;
-                        int maxDy = Math.max(extend, blocks.length);
-                        for (int dy = 0; dy < maxDy; dy++) {
-                            if (dy > blocks.length - 1) {
+                            int minY = Settings.Schematics.PASTE_ROAD_ON_TOP ? plotWorld.SCHEM_Y : 1;
+                            int maxY = Math.max(extend, blocks.length);
+                            for (int y = 0; y < maxY; y++) {
+                                if (y > blocks.length - 1) {
                                     queue.setBlock(
                                             finalX + X + plotWorld.ROAD_OFFSET_X,
-                                        minY + dy,
+                                            minY + y,
                                             finalZ + Z + plotWorld.ROAD_OFFSET_Z,
                                             WEExtent.AIRBASE
                                     );
                                 } else {
-                                BaseBlock block = blocks[dy];
+                                    BaseBlock block = blocks[y];
                                     if (block != null) {
                                         queue.setBlock(
                                                 finalX + X + plotWorld.ROAD_OFFSET_X,
-                                            minY + dy,
+                                                minY + y,
                                                 finalZ + Z + plotWorld.ROAD_OFFSET_Z,
                                                 block
                                         );
                                     } else {
                                         queue.setBlock(
                                                 finalX + X + plotWorld.ROAD_OFFSET_X,
-                                            minY + dy,
+                                                minY + y,
                                                 finalZ + Z + plotWorld.ROAD_OFFSET_Z,
                                                 WEExtent.AIRBASE
                                         );
@@ -740,9 +676,8 @@ public class HybridUtils {
                         }
                     }
                 }
-            if (enqueue) {
                 queue.enqueue();
-            }
+            });
             return true;
         }
         return false;

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

@@ -47,25 +47,16 @@ public abstract class IndependentPlotGenerator {
     public abstract String getName();
 
     /**
-     * Generate chunk block data
+     * Use the setBlock or setBiome method of the PlotChunk result parameter to make changes.
+     * The PlotArea settings is the same one this was initialized with.
+     * The PseudoRandom random is a fast random object.
      *
      * @param result   queue
      * @param settings PlotArea (settings)
-     * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7.
      */
-    @Deprecated(forRemoval = true, since = "6.9.0")
     public abstract void generateChunk(ScopedQueueCoordinator result, PlotArea settings);
 
-    /**
-     * Populates the queue representing a chunk area with tile entities and entities
-     *
-     * @param result   Queue to write to
-     * @param settings PlotArea (settings)
-     * @return True if any population occurred
-     * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7.
-     */
-    @Deprecated(forRemoval = true, since = "6.9.0")
-    public boolean populateChunk(ScopedQueueCoordinator result, PlotArea settings) {
+    public boolean populateChunk(ScopedQueueCoordinator result, PlotArea setting) {
         return false;
     }
 

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

@@ -96,7 +96,7 @@ public abstract class SquarePlotManager extends GridPlotManager {
                 .floor(squarePlotWorld.ROAD_WIDTH / 2) - 1;
         int z = (squarePlotWorld.ROAD_OFFSET_Z + (pz * (squarePlotWorld.ROAD_WIDTH + squarePlotWorld.PLOT_WIDTH))) - (int) Math
                 .floor(squarePlotWorld.ROAD_WIDTH / 2) - 1;
-        return Location.at(squarePlotWorld.getWorldName(), x, squarePlotWorld.getMaxGenHeight(), z);
+        return Location.at(squarePlotWorld.getWorldName(), x, Math.min(getWorldHeight(), 255), z);
     }
 
     @Override
@@ -260,7 +260,7 @@ public abstract class SquarePlotManager extends GridPlotManager {
                 - (int) Math.floor(squarePlotWorld.ROAD_WIDTH / 2);
         int z = (squarePlotWorld.ROAD_OFFSET_Z + (pz * (squarePlotWorld.ROAD_WIDTH + squarePlotWorld.PLOT_WIDTH))) - squarePlotWorld.PLOT_WIDTH
                 - (int) Math.floor(squarePlotWorld.ROAD_WIDTH / 2);
-        return Location.at(squarePlotWorld.getWorldName(), x, squarePlotWorld.getMinGenHeight(), z);
+        return Location.at(squarePlotWorld.getWorldName(), x, squarePlotWorld.getMinBuildHeight(), z);
     }
 
 }

Core/src/main/java/com/plotsquared/core/inject/factory/ChunkCoordinatorFactory.java

@@ -25,7 +25,6 @@
  */
 package com.plotsquared.core.inject.factory;
 
-import com.google.inject.assistedinject.Assisted;
 import com.plotsquared.core.queue.ChunkCoordinator;
 import com.plotsquared.core.queue.subscriber.ProgressSubscriber;
 import com.sk89q.worldedit.math.BlockVector2;
@@ -45,9 +44,8 @@ public interface ChunkCoordinatorFactory {
             final @NonNull Collection<BlockVector2> requestedChunks,
             final @NonNull Runnable whenDone,
             final @NonNull Consumer<Throwable> throwableConsumer,
-            @Assisted("unloadAfter") final boolean unloadAfter,
-            final @NonNull Collection<ProgressSubscriber> progressSubscribers,
-            @Assisted("forceSync") final boolean forceSync
+            final boolean unloadAfter,
+            final @NonNull Collection<ProgressSubscriber> progressSubscribers
     );
 
 }

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

@@ -174,9 +174,21 @@ public class PlotListener {
             String greeting = plot.getFlag(GreetingFlag.class);
             if (!greeting.isEmpty()) {
                 if (!Settings.Chat.NOTIFICATION_AS_ACTIONBAR) {
-                    plot.format(StaticCaption.of(greeting), player, false).thenAcceptAsync(player::sendMessage);
+                    player.sendMessage(
+                            TranslatableCaption.of("flags.greeting_flag_format"),
+                            Template.of("world", plot.getWorldName()),
+                            Template.of("plot_id", plot.getId().toString()),
+                            Template.of("alias", plot.getAlias()),
+                            Template.of("greeting", greeting)
+                    );
                 } else {
-                    plot.format(StaticCaption.of(greeting), player, false).thenAcceptAsync(player::sendActionBar);
+                    player.sendActionBar(
+                            TranslatableCaption.of("flags.greeting_flag_format"),
+                            Template.of("world", plot.getWorldName()),
+                            Template.of("plot_id", plot.getId().toString()),
+                            Template.of("alias", plot.getAlias()),
+                            Template.of("greeting", greeting)
+                    );
                 }
             }
 
@@ -309,7 +321,7 @@ public class PlotListener {
                         }
                         if ((lastPlot != null) && plot.getId().equals(lastPlot.getId()) && plot.hasOwner()) {
                             final UUID plotOwner = plot.getOwnerAbs();
-                            String owner = PlayerManager.resolveName(plotOwner, true).getComponent(player);
+                            String owner = PlayerManager.resolveName(plotOwner, false).getComponent(player);
                             Caption header = fromFlag ? StaticCaption.of(title) : TranslatableCaption.of("titles" +
                                     ".title_entered_plot");
                             Caption subHeader = fromFlag ? StaticCaption.of(subtitle) : TranslatableCaption.of("titles" +
@@ -401,9 +413,21 @@ public class PlotListener {
                 String farewell = plot.getFlag(FarewellFlag.class);
                 if (!farewell.isEmpty()) {
                     if (!Settings.Chat.NOTIFICATION_AS_ACTIONBAR) {
-                        plot.format(StaticCaption.of(farewell), player, false).thenAcceptAsync(player::sendMessage);
+                        player.sendMessage(
+                                TranslatableCaption.of("flags.farewell_flag_format"),
+                                Template.of("world", plot.getWorldName()),
+                                Template.of("plot_id", plot.getId().toString()),
+                                Template.of("alias", plot.getAlias()),
+                                Template.of("farewell", farewell)
+                        );
                     } else {
-                        plot.format(StaticCaption.of(farewell), player, false).thenAcceptAsync(player::sendActionBar);
+                        player.sendActionBar(
+                                TranslatableCaption.of("flags.farewell_flag_format"),
+                                Template.of("world", plot.getWorldName()),
+                                Template.of("plot_id", plot.getId().toString()),
+                                Template.of("alias", plot.getAlias()),
+                                Template.of("farewell", farewell)
+                        );
                     }
                 }
 

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

@@ -35,7 +35,6 @@ import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.Permissions;
 import com.plotsquared.core.util.WEManager;
 import com.plotsquared.core.util.WorldUtil;
-import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.event.extent.EditSessionEvent;
@@ -68,9 +67,6 @@ public class WESubscriber {
             WorldEdit.getInstance().getEventBus().unregister(this);
             return;
         }
-        if (event.getStage() != EditSession.Stage.BEFORE_HISTORY) {
-            return;
-        }
         World worldObj = event.getWorld();
         if (worldObj == null) {
             return;

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

@@ -41,17 +41,14 @@ import org.khelekore.prtree.SimpleMBR;
  * An unmodifiable 6-tuple (world,x,y,z,yaw,pitch)
  */
 @SuppressWarnings("unused")
-public sealed class Location extends BlockLoc implements Comparable<Location> permits UncheckedWorldLocation {
+public final class Location extends BlockLoc implements Comparable<Location> {
 
     private final float yaw;
     private final float pitch;
     private final BlockVector3 blockVector3;
     private final World<?> world;
 
-    /**
-     * @since 6.9.0
-     */
-    protected Location(
+    private Location(
             final @NonNull World<?> world, final @NonNull BlockVector3 blockVector3,
             final float yaw, final float pitch
     ) {

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

@@ -1,77 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *               Copyright (C) 2014 - 2022 IntellectualSites
- *
- *     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.location;
-
-import com.plotsquared.core.util.AnnotationHelper;
-import com.sk89q.worldedit.math.BlockVector3;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-/**
- * Used internally for generation to reference locations in worlds that "don't exist yet". There is no guarantee that the world
- * name provided by {@link UncheckedWorldLocation#getWorldName()} exists on the server.
- *
- * @since 6.9.0
- */
-@AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.")
-public final class UncheckedWorldLocation extends Location {
-
-    private final String worldName;
-
-    /**
-     * @since 6.9.0
-     */
-    private UncheckedWorldLocation(
-            final @NonNull String worldName, final int x, final int y, final int z
-    ) {
-        super(World.nullWorld(), BlockVector3.at(x, y, z), 0f, 0f);
-        this.worldName = worldName;
-    }
-
-    /**
-     * Construct a new location with yaw and pitch equal to 0
-     *
-     * @param world World
-     * @param x     X coordinate
-     * @param y     Y coordinate
-     * @param z     Z coordinate
-     * @return New location
-     *
-     * @since 6.9.0
-     */
-    @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.")
-    public static @NonNull UncheckedWorldLocation at(
-            final @NonNull String world, final int x, final int y, final int z
-    ) {
-        return new UncheckedWorldLocation(world, x, y, z);
-    }
-
-    @Override
-    @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.")
-    public @NonNull String getWorldName() {
-        return this.worldName;
-    }
-
-}

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

@@ -58,21 +58,6 @@ public interface World<T> {
      */
     @NonNull String getName();
 
-    /**
-     * Get the min world height. Inclusive.
-     *
-     * @since 6.6.0
-     */
-    int getMinHeight();
-
-
-    /**
-     * Get the max world height. Inclusive.
-     *
-     * @since 6.6.0
-     */
-    int getMaxHeight();
-
     class NullWorld<T> implements World<T> {
 
         private NullWorld() {
@@ -89,16 +74,6 @@ public interface World<T> {
             return "";
         }
 
-        @Override
-        public int getMinHeight() {
-            return 0;
-        }
-
-        @Override
-        public int getMaxHeight() {
-            return 0;
-        }
-
         @Override
         public boolean equals(final Object obj) {
             return obj instanceof NullWorld;

Core/src/main/java/com/plotsquared/core/permissions/PermissionHolder.java

@@ -52,7 +52,6 @@ public interface PermissionHolder {
      * @param permission Permission
      * @param key        Permission "key"
      * @return {@code true} if the owner has the given permission, else {@code false}
-     * @since 6.0.10
      */
     default boolean hasKeyedPermission(
             final @NonNull String permission,
@@ -116,7 +115,6 @@ public interface PermissionHolder {
      * @param permission Permission
      * @param key        Permission "key"
      * @return {@code true} if the owner has the given permission, else {@code false}
-     * @since 6.0.10
      */
     boolean hasKeyedPermission(@Nullable String world, @NonNull String permission, @NonNull String key);
 

Core/src/main/java/com/plotsquared/core/permissions/PermissionProfile.java

@@ -59,9 +59,7 @@ public interface PermissionProfile {
      * @param permission Permission
      * @param key        Permission "key"
      * @return {@code true} if the owner has the given permission, else {@code false}
-     * @since 6.0.10
      */
-    @SuppressWarnings("unused")
     default boolean hasKeyedPermission(
             final @NonNull String permission,
             final @NonNull String key
@@ -77,7 +75,6 @@ public interface PermissionProfile {
      * @param permission Permission
      * @param key        Permission "key"
      * @return {@code true} if the owner has the given permission, else {@code false}
-     * @since 6.0.10
      */
     boolean hasKeyedPermission(
             @Nullable String world, final @NonNull String permission,

Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java

@@ -378,12 +378,9 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
     /**
      * Get a {@link Set} of plots owned by this player.
      *
-     * <p>
-     * Take a look at {@link PlotSquared} for more searching functions.
-     * See {@link #getPlotCount()} for the number of plots.
-     * </p>
-     *
      * @return a {@link Set} of plots owned by the player
+     * @see PlotSquared for more searching functions
+     * @see #getPlotCount() for the number of plots
      */
     public Set<Plot> getPlots() {
         return PlotQuery.newQuery().ownedBy(this).asSet();
@@ -504,7 +501,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
      * Retrieves the attribute of this player.
      *
      * @param key metadata key
-     * @return the attribute will be either {@code true} or {@code false}
+     * @return the attribute will be either true or false
      */
     public boolean getAttribute(String key) {
         if (!hasPersistentMeta("attrib_" + key)) {
@@ -575,7 +572,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
     /**
      * Check if this player is banned.
      *
-     * @return {@code true} if the player is banned, {@code false} otherwise.
+     * @return true if the player is banned, false otherwise.
      */
     public abstract boolean isBanned();
 

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

@@ -122,7 +122,7 @@ import static com.plotsquared.core.util.entity.EntityCategories.CAP_VEHICLE;
  */
 public class Plot {
 
-    @Deprecated(forRemoval = true, since = "6.6.0")
+
     public static final int MAX_HEIGHT = 256;
 
     private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Plot.class.getSimpleName());
@@ -219,13 +219,10 @@ public class Plot {
      * Constructor for a new plot.
      * (Only changes after plot.create() will be properly set in the database)
      *
-     * <p>
-     * See {@link Plot#getPlot(Location)} for existing plots
-     * </p>
-     *
      * @param area  the PlotArea where the plot is located
      * @param id    the plot id
      * @param owner the plot owner
+     * @see Plot#getPlot(Location) for existing plots
      */
     public Plot(final PlotArea area, final @NonNull PlotId id, final UUID owner) {
         this(area, id, owner, 0);
@@ -235,12 +232,9 @@ public class Plot {
      * Constructor for an unowned plot.
      * (Only changes after plot.create() will be properly set in the database)
      *
-     * <p>
-     * See {@link Plot#getPlot(Location)} for existing plots
-     * </p>
-     *
      * @param area the PlotArea where the plot is located
      * @param id   the plot id
+     * @see Plot#getPlot(Location) for existing plots
      */
     public Plot(final @NonNull PlotArea area, final @NonNull PlotId id) {
         this(area, id, null, 0);
@@ -251,14 +245,11 @@ public class Plot {
      * The database will ignore any queries regarding temporary plots.
      * Please note that some bulk plot management functions may still affect temporary plots (TODO: fix this)
      *
-     * <p>
-     * See {@link Plot#getPlot(Location)} for existing plots
-     * </p>
-     *
      * @param area  the PlotArea where the plot is located
      * @param id    the plot id
      * @param owner the owner of the plot
      * @param temp  Represents whatever the database manager needs it to
+     * @see Plot#getPlot(Location) for existing plots
      */
     public Plot(final PlotArea area, final @NonNull PlotId id, final UUID owner, final int temp) {
         this.area = area;
@@ -275,10 +266,6 @@ public class Plot {
     /**
      * Constructor for a saved plots (Used by the database manager when plots are fetched)
      *
-     * <p>
-     * See {@link Plot#getPlot(Location)} for existing plots
-     * </p>
-     *
      * @param id        the plot id
      * @param owner     the plot owner
      * @param trusted   the plot trusted players
@@ -291,6 +278,7 @@ public class Plot {
      * @param merged    an array giving merged plots
      * @param timestamp when the plot was created
      * @param temp      value representing whatever DBManager needs to to. Do not touch tbh.
+     * @see Plot#getPlot(Location) for existing plots
      */
     public Plot(
             @NonNull PlotId id,
@@ -430,12 +418,9 @@ public class Plot {
     /**
      * Return a new/cached plot object at a given location.
      *
-     * <p>
-     * Use {@link PlotPlayer#getCurrentPlot()} if a player is expected here.
-     * </p>
-     *
      * @param location the location of the plot
      * @return plot at location or null
+     * @see PlotPlayer#getCurrentPlot() if a player is expected here.
      */
     public static @Nullable Plot getPlot(final @NonNull Location location) {
         final PlotArea pa = location.getPlotArea();
@@ -603,13 +588,10 @@ public class Plot {
     /**
      * Get the plot owner of this particular sub-plot.
      * (Merged plots can have multiple owners)
-     * Direct access is discouraged: use {@link #getOwners()}
-     *
-     * <p>
-     * Use {@link #getOwnerAbs()} to get the owner as stored in the database
-     * </p>
+     * Direct access is discouraged: use getOwners()
      *
      * @return Server if ServerPlot flag set, else {@link #getOwnerAbs()}
+     * @see #getOwnerAbs() getOwnerAbs() to get the owner as stored in the database
      */
     public @Nullable UUID getOwner() {
         if (this.getFlag(ServerPlotFlag.class)) {
@@ -1219,6 +1201,12 @@ public class Plot {
      *
      * @return array of entity counts
      * @see RegionManager#countEntities(Plot)
+     *         0 = Entity
+     *         1 = Animal
+     *         2 = Monster
+     *         3 = Mob
+     *         4 = Boat
+     *         5 = Misc
      */
     public int[] countEntities() {
         int[] count = new int[6];
@@ -1237,7 +1225,7 @@ public class Plot {
     /**
      * Returns true if a previous task was running
      *
-     * @return {@code true} if a previous task is running
+     * @return true if a previous task is running
      */
     public int addRunning() {
         int value = this.getRunning();
@@ -1281,7 +1269,7 @@ public class Plot {
     /**
      * Unclaim the plot (does not modify terrain). Changes made to this plot will not be reflected in unclaimed plot objects.
      *
-     * @return {@code false} if the Plot has no owner, otherwise {@code true}.
+     * @return false if the Plot has no owner, otherwise true.
      */
     public boolean unclaim() {
         if (!this.hasOwner()) {
@@ -1371,7 +1359,7 @@ public class Plot {
         int z = largest.getMinimumPoint().getZ() - 1;
         PlotManager manager = getManager();
         int y = isLoaded() ? this.worldUtil.getHighestBlockSynchronous(getWorldName(), x, z) : 62;
-        if (area.allowSigns() && (y <= area.getMinGenHeight() || y >= area.getMaxGenHeight())) {
+        if (area.allowSigns() && (y <= 0 || y >= 255)) {
             y = Math.max(y, manager.getSignLoc(this).getY() - 1);
         }
         return Location.at(getWorldName(), x, y + 1, z);
@@ -1387,7 +1375,7 @@ public class Plot {
         if (isLoaded()) {
             this.worldUtil.getHighestBlock(getWorldName(), x, z, y -> {
                 int height = y;
-                if (area.allowSigns() && (y <= area.getMinGenHeight() || y >= area.getMaxGenHeight())) {
+                if (area.allowSigns() && (y <= 0 || y >= 255)) {
                     height = Math.max(y, manager.getSignLoc(this).getY() - 1);
                 }
                 result.accept(Location.at(getWorldName(), x, height + 1, z));
@@ -1420,7 +1408,15 @@ public class Plot {
                         0
                 );
             }
-            Location location = toHomeLocation(bottom, home);
+            Location location = Location
+                    .at(
+                            bottom.getWorldName(),
+                            bottom.getX() + home.getX(),
+                            bottom.getY() + home.getY(),
+                            bottom.getZ() + home.getZ(),
+                            home.getYaw(),
+                            home.getPitch()
+                    );
             if (!this.worldUtil.getBlockSynchronous(location).getBlockType().getMaterial().isAir()) {
                 location = location.withY(
                         Math.max(1 + this.worldUtil.getHighestBlockSynchronous(
@@ -1453,7 +1449,15 @@ public class Plot {
                 return;
             }
             Location bottom = this.getBottomAbs();
-            Location location = toHomeLocation(bottom, home);
+            Location location = Location
+                    .at(
+                            bottom.getWorldName(),
+                            bottom.getX() + home.getX(),
+                            bottom.getY() + home.getY(),
+                            bottom.getZ() + home.getZ(),
+                            home.getYaw(),
+                            home.getPitch()
+                    );
             this.worldUtil.getBlock(location, block -> {
                 if (!block.getBlockType().getMaterial().isAir()) {
                     this.worldUtil.getHighestBlock(this.getWorldName(), location.getX(), location.getZ(),
@@ -1466,17 +1470,6 @@ public class Plot {
         }
     }
 
-    private Location toHomeLocation(Location bottom, BlockLoc relativeHome) {
-        return Location.at(
-                bottom.getWorldName(),
-                bottom.getX() + relativeHome.getX(),
-                relativeHome.getY(), // y is absolute
-                bottom.getZ() + relativeHome.getZ(),
-                relativeHome.getYaw(),
-                relativeHome.getPitch()
-        );
-    }
-
     /**
      * Sets the home location
      *
@@ -1614,8 +1607,8 @@ public class Plot {
     public double getVolume() {
         double count = 0;
         for (CuboidRegion region : getRegions()) {
-            // CuboidRegion#getArea is deprecated and we want to ensure use of correct height
-            count += region.getLength() * region.getWidth() * (area.getMaxGenHeight() - area.getMinGenHeight() + 1);
+            count += (region.getMaximumPoint().getX() - (double) region.getMinimumPoint().getX() + 1) * (
+                    region.getMaximumPoint().getZ() - (double) region.getMinimumPoint().getZ() + 1) * MAX_HEIGHT;
         }
         return count;
     }
@@ -1693,7 +1686,7 @@ public class Plot {
         return base.settings != null && base.settings.getRatings() != null;
     }
 
-    @Deprecated(forRemoval = true, since = "6.1.0")
+    @Deprecated(forRemoval = true)
     public boolean claim(final @NonNull PlotPlayer<?> player, boolean teleport, String schematic) {
         if (!canClaim(player)) {
             return false;
@@ -1701,7 +1694,7 @@ public class Plot {
         return claim(player, teleport, schematic, true);
     }
 
-    @Deprecated(forRemoval = true, since = "6.1.0")
+    @Deprecated(forRemoval = true)
     public boolean claim(final @NonNull PlotPlayer<?> player, boolean teleport, String schematic, boolean updateDB) {
         return claim(player, teleport, schematic, updateDB, false);
     }
@@ -1715,7 +1708,6 @@ public class Plot {
      * @param updateDB  If the database should be updated
      * @param auto      If the plot is being claimed by a /plot auto
      * @return success
-     * @since 6.1.0
      */
     public boolean claim(
             final @NonNull PlotPlayer<?> player, boolean teleport, String schematic, boolean updateDB,
@@ -1733,6 +1725,7 @@ public class Plot {
             area.addPlot(this);
             updateWorldBorder();
         }
+        this.getPlotModificationManager().setSign(player.getName());
         player.sendMessage(TranslatableCaption.of("working.claimed"), Template.of("plot", this.getId().toString()));
         if (teleport) {
             if (!auto && Settings.Teleport.ON_CLAIM) {
@@ -1780,7 +1773,6 @@ public class Plot {
             );
         }
         plotworld.getPlotManager().claimPlot(this, null);
-        this.getPlotModificationManager().setSign(player.getName());
         return true;
     }
 
@@ -2433,8 +2425,8 @@ public class Plot {
             return regions_cache;
         }
         if (!this.isMerged()) {
-            Location pos1 = this.getBottomAbs().withY(getArea().getMinBuildHeight());
-            Location pos2 = this.getTopAbs().withY(getArea().getMaxBuildHeight());
+            Location pos1 = this.getBottomAbs();
+            Location pos2 = this.getTopAbs();
             connected_cache = Sets.newHashSet(this);
             CuboidRegion rg = new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3());
             regions_cache = Collections.singleton(rg);
@@ -2677,7 +2669,7 @@ public class Plot {
     /**
      * Checks if the owner of this Plot is online.
      *
-     * @return {@code true} if the owner of the Plot is online
+     * @return true if the owner of the Plot is online
      */
     public boolean isOnline() {
         if (!this.hasOwner()) {
@@ -3039,11 +3031,8 @@ public class Plot {
      * If rating categories are enabled, get the average rating by category.<br>
      * - The index corresponds to the index of the category in the config
      *
-     * <p>
-     * See {@link Settings.Ratings#CATEGORIES} for rating categories
-     * </p>
-     *
      * @return Average ratings in each category
+     * @see Settings.Ratings#CATEGORIES Rating categories
      */
     public @NonNull double[] getAverageRatings() {
         Map<UUID, Integer> rating;

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

@@ -34,6 +34,8 @@ import com.plotsquared.core.configuration.ConfigurationNode;
 import com.plotsquared.core.configuration.ConfigurationSection;
 import com.plotsquared.core.configuration.ConfigurationUtil;
 import com.plotsquared.core.configuration.Settings;
+import com.plotsquared.core.configuration.caption.CaptionUtility;
+import com.plotsquared.core.configuration.caption.LocaleHolder;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.configuration.file.YamlConfiguration;
 import com.plotsquared.core.generator.GridPlotWorld;
@@ -52,6 +54,7 @@ import com.plotsquared.core.plot.flag.FlagParseException;
 import com.plotsquared.core.plot.flag.GlobalFlagContainer;
 import com.plotsquared.core.plot.flag.PlotFlag;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
+import com.plotsquared.core.plot.flag.types.DoubleFlag;
 import com.plotsquared.core.queue.GlobalBlockQueue;
 import com.plotsquared.core.queue.QueueCoordinator;
 import com.plotsquared.core.util.MathMan;
@@ -65,6 +68,7 @@ import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.biome.BiomeTypes;
 import com.sk89q.worldedit.world.gamemode.GameMode;
 import com.sk89q.worldedit.world.gamemode.GameModes;
+import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.Template;
 import org.apache.logging.log4j.LogManager;
@@ -140,10 +144,8 @@ public abstract class PlotArea {
     private boolean homeAllowNonmember = false;
     private BlockLoc nonmemberHome;
     private BlockLoc defaultHome;
-    private int maxBuildHeight = PlotSquared.platform().versionMaxHeight() + 1; // Exclusive
-    private int minBuildHeight = PlotSquared.platform().versionMinHeight() + 1; // Inclusive
-    private int maxGenHeight = PlotSquared.platform().versionMaxHeight(); // Inclusive
-    private int minGenHeight = PlotSquared.platform().versionMinHeight(); // Inclusive
+    private int maxBuildHeight = 256;
+    private int minBuildHeight = 1;
     private GameMode gameMode = GameModes.CREATIVE;
     private Map<String, PlotExpression> prices = new HashMap<>();
     private List<String> schematics = new ArrayList<>();
@@ -293,7 +295,7 @@ public abstract class PlotArea {
      * Check if a PlotArea is compatible (move/copy etc.).
      *
      * @param plotArea the {@link PlotArea} to compare
-     * @return {@code true} if both areas are compatible
+     * @return true if both areas are compatible
      */
     public boolean isCompatible(final @NonNull PlotArea plotArea) {
         final ConfigurationSection section = this.worldConfiguration.getConfigurationSection("worlds");
@@ -359,8 +361,6 @@ public abstract class PlotArea {
         this.worldBorder = config.getBoolean("world.border");
         this.maxBuildHeight = config.getInt("world.max_height");
         this.minBuildHeight = config.getInt("world.min_height");
-        this.minGenHeight = config.getInt("world.min_gen_height");
-        this.maxGenHeight = config.getInt("world.max_gen_height");
 
         switch (config.getString("world.gamemode").toLowerCase()) {
             case "creative", "c", "1" -> this.gameMode = GameModes.CREATIVE;
@@ -484,8 +484,6 @@ public abstract class PlotArea {
         options.put("home.nonmembers", position);
         options.put("world.max_height", this.getMaxBuildHeight());
         options.put("world.min_height", this.getMinBuildHeight());
-        options.put("world.min_gen_height", this.getMinGenHeight());
-        options.put("world.max_gen_height", this.getMaxGenHeight());
         options.put("world.gamemode", this.getGameMode().getName().toLowerCase());
         options.put("road.flags.default", null);
 
@@ -964,31 +962,7 @@ public abstract class PlotArea {
         return this.plots.remove(id) != null;
     }
 
-    /**
-     * Merge a list of plots together. This is non-blocking for the world-changes that will be made. To run a task when the
-     * world changes are complete, use {@link PlotArea#mergePlots(List, boolean, Runnable)};
-     *
-     * @param plotIds     List of plot IDs to merge
-     * @param removeRoads If the roads between plots should be removed
-     * @return if merges were completed successfully.
-     */
     public boolean mergePlots(final @NonNull List<PlotId> plotIds, final boolean removeRoads) {
-        return mergePlots(plotIds, removeRoads, null);
-    }
-
-    /**
-     * Merge a list of plots together. This is non-blocking for the world-changes that will be made.
-     *
-     * @param plotIds     List of plot IDs to merge
-     * @param removeRoads If the roads between plots should be removed
-     * @param whenDone  Task to run when any merge world changes are complete. Also runs if no changes were made. Does not
-     *                    run if there was an error or if too few plots IDs were supplied.
-     * @return if merges were completed successfully.
-     * @since 6.9.0
-     */
-    public boolean mergePlots(
-            final @NonNull List<PlotId> plotIds, final boolean removeRoads, final @Nullable Runnable whenDone
-    ) {
         if (plotIds.size() < 2) {
             return false;
         }
@@ -1051,9 +1025,6 @@ public abstract class PlotArea {
             }
         }
         manager.finishPlotMerge(plotIds, queue);
-        if (whenDone != null) {
-            queue.setCompleteTask(whenDone);
-        }
         queue.enqueue();
         return true;
     }
@@ -1107,8 +1078,8 @@ public abstract class PlotArea {
                     BlockVector2 pos1 = BlockVector2.at(value.getP1().getX(), value.getP1().getY());
                     BlockVector2 pos2 = BlockVector2.at(value.getP2().getX(), value.getP2().getY());
                     return new CuboidRegion(
-                            pos1.toBlockVector3(getMinGenHeight()),
-                            pos2.toBlockVector3(getMaxGenHeight())
+                            pos1.toBlockVector3(),
+                            pos2.toBlockVector3(Plot.MAX_HEIGHT - 1)
                     );
                 }
             };
@@ -1130,7 +1101,7 @@ public abstract class PlotArea {
      * If a schematic is available, it can be used for plot claiming.
      *
      * @param schematic the schematic to look for.
-     * @return {@code true} if the schematic exists, {@code false} otherwise.
+     * @return true if the schematic exists, false otherwise.
      */
     public boolean hasSchematic(@NonNull String schematic) {
         return getSchematics().contains(schematic.toLowerCase());
@@ -1139,7 +1110,7 @@ public abstract class PlotArea {
     /**
      * Get whether economy is enabled and used on this plot area or not.
      *
-     * @return {@code true} if this plot area uses economy, {@code false} otherwise.
+     * @return true if this plot area uses economy, false otherwise.
      */
     public boolean useEconomy() {
         return useEconomy;
@@ -1148,7 +1119,7 @@ public abstract class PlotArea {
     /**
      * Get whether the plot area is limited by a world border or not.
      *
-     * @return {@code true} if the plot area has a world border, {@code false} otherwise.
+     * @return true if the plot area has a world border, false otherwise.
      */
     public boolean hasWorldBorder() {
         return worldBorder;
@@ -1157,7 +1128,7 @@ public abstract class PlotArea {
     /**
      * Get whether plot signs are allowed or not.
      *
-     * @return {@code true} if plot signs are allowed, {@code false} otherwise.
+     * @return true if plot signs are allow, false otherwise.
      */
     public boolean allowSigns() {
         return allowSigns;
@@ -1305,9 +1276,8 @@ public abstract class PlotArea {
      * @deprecated Use {@link #signMaterial()}. This method is used for 1.13 only and
      *         will be removed without replacement in favor of {@link #signMaterial()}
      *         once we remove the support for 1.13.
-     * @since 6.0.3
      */
-    @Deprecated(forRemoval = true, since = "6.0.3")
+    @Deprecated(forRemoval = true)
     public String getLegacySignMaterial() {
         return this.legacySignMaterial;
     }
@@ -1353,18 +1323,14 @@ public abstract class PlotArea {
 
     /**
      * Get the location for non-members to be teleported to.
-     *
-     * @since 6.1.4
      */
     public BlockLoc nonmemberHome() {
         return this.nonmemberHome;
     }
 
     /**
-     * Get the default location for players to be teleported to. May be overridden by {@link #nonmemberHome} if the player is
+     * Get the default location for players to be teleported to. May be overriden by {@link #nonmemberHome} if the player is
      * not a member of the plot.
-     *
-     * @since 6.1.4
      */
     public BlockLoc defaultHome() {
         return this.defaultHome;
@@ -1373,7 +1339,7 @@ public abstract class PlotArea {
     /**
      * @deprecated Use {@link #nonmemberHome}
      */
-    @Deprecated(forRemoval = true, since = "6.1.4")
+    @Deprecated(forRemoval = true)
     public PlotLoc getNonmemberHome() {
         return new PlotLoc(this.defaultHome.getX(), this.defaultHome.getY(), this.defaultHome.getZ());
     }
@@ -1381,7 +1347,7 @@ public abstract class PlotArea {
     /**
      * @deprecated Use {@link #defaultHome}
      */
-    @Deprecated(forRemoval = true, since = "6.1.4")
+    @Deprecated(forRemoval = true)
     public PlotLoc getDefaultHome() {
         return new PlotLoc(this.defaultHome.getX(), this.defaultHome.getY(), this.defaultHome.getZ());
     }
@@ -1390,38 +1356,14 @@ public abstract class PlotArea {
         this.defaultHome = defaultHome;
     }
 
-    /**
-     * Get the maximum height players may build in. Exclusive.
-     */
     public int getMaxBuildHeight() {
         return this.maxBuildHeight;
     }
 
-    /**
-     * Get the minimum height players may build in. Inclusive.
-     */
     public int getMinBuildHeight() {
         return this.minBuildHeight;
     }
 
-    /**
-     * Get the min height from which PlotSquared will generate blocks. Inclusive.
-     *
-     * @since 6.6.0
-     */
-    public int getMinGenHeight() {
-        return this.minGenHeight;
-    }
-
-    /**
-     * Get the max height to which PlotSquared will generate blocks. Inclusive.
-     *
-     * @since 6.6.0
-     */
-    public int getMaxGenHeight() {
-        return this.maxGenHeight;
-    }
-
     public GameMode getGameMode() {
         return this.gameMode;
     }