build: Update release-drafter/release-drafter action to v5.20.0

2025-07-24 16:15:27 +02:00 · 2022-05-16 12:37:49 +00:00
49 changed files with 392 additions and 1071 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -27,12 +27,14 @@ 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

--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -14,6 +14,6 @@ jobs:
    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.20.0
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@@ -131,9 +131,5 @@ local.properties
 checkstyle.xml
 classes/
 *.bat
-
-# Other
 docs/
 build/
-
-.DS_Store
--- a/.idea/icon.svg
+++ b/.idea/icon.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" id="svg2" xml:space="preserve" width="4000" height="3333.3333" viewBox="0 0 4000 3333.3333" sodipodi:docname="PlotSquared.ai">
+<svg 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" viewBox="0 0 4000 3333.3333" height="3333.3333" width="4000" xml:space="preserve" id="svg2" version="1.1">
 		<metadata id="metadata8">
 			<rdf:RDF>
 				<cc:Work rdf:about="">
@@ -9,42 +9,41 @@
 			</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 id="clipPath18" clipPathUnits="userSpaceOnUse">
+				<path id="path16" d="M 0,2500 H 3000 V 0 H 0 Z" />
 			</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 transform="matrix(1.3333333,0,0,-1.3333333,0,3333.3333)" id="g10">
 			<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 clip-path="url(#clipPath18)" id="g14">
+					<g transform="translate(1486.1511,2242.6453)" id="g20">
+						<path id="path22" style="fill:#2b3f56;fill-opacity:1;fill-rule:nonzero;stroke:none" 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" />
 					</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 transform="translate(1201.7948,1741.5303)" id="g24">
+						<path id="path26" style="fill:#5693ce;fill-opacity:1;fill-rule:nonzero;stroke:none" 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" />
 					</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 transform="translate(919.3342,1429.7462)" id="g28">
+						<path id="path30" style="fill:#5693ce;fill-opacity:1;fill-rule:nonzero;stroke:none" 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" />
 					</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 transform="translate(1649.134,1700.6166)" id="g32">
+						<path id="path34" style="fill:#feeeef;fill-opacity:1;fill-rule:nonzero;stroke:none" 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" />
 					</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 transform="translate(1262.7214,1613.126)" id="g36">
+						<path id="path38" style="fill:#feeeef;fill-opacity:1;fill-rule:nonzero;stroke:none" 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" />
 					</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 transform="translate(1966.3174,1675.6364)" id="g40">
+						<path id="path42" style="fill:#2a3746;fill-opacity:1;fill-rule:nonzero;stroke:none" 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" />
 					</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 transform="translate(1499.3971,1669.1094)" id="g44">
+						<path id="path46" style="fill:#3378bc;fill-opacity:1;fill-rule:nonzero;stroke:none" 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" />
 					</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 transform="translate(1748.0469,1601.6797)" id="g48">
+						<path id="path50" style="fill:#3378bc;fill-opacity:1;fill-rule:nonzero;stroke:none" 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" />
 					</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 transform="translate(1262.7214,1613.126)" id="g52">
+						<path id="path54" style="fill:#3378bc;fill-opacity:1;fill-rule:nonzero;stroke:none" 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" />
 					</g>
 				</g>
 			</g>
 		</g>
-</svg>
+	</svg>
--- a/.lift.toml
+++ b/.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"]
--- a/Bukkit/build.gradle.kts
+++ b/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 {
@@ -85,8 +85,6 @@ tasks.named<ShadowJar>("shadowJar") {
    relocate("javax.annotation", "com.plotsquared.core.annotation")
    relocate("com.github.spotbugs", "com.plotsquared.core.spotbugs")
    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,10 +95,10 @@ tasks.named<ShadowJar>("shadowJar") {
 tasks {
    withType<Javadoc> {
        val opt = options as StandardJavadocDocletOptions
-        opt.links("https://jd.papermc.io/paper/1.18/")
+        opt.links("https://papermc.io/javadocs/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/4.9.3/")
+        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/")
    }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
@@ -270,7 +270,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 +278,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 +432,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
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java
+++ b/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,35 @@ 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
+        final ChunkWrapper wrap = new ChunkWrapper(area.getWorldName(), source.getX(), source.getZ());
+        final ScopedQueueCoordinator chunk = this.queue.getForChunk(wrap.x, wrap.z,
+                com.plotsquared.bukkit.util.BukkitWorld.getMinWorldHeight(world),
+                com.plotsquared.bukkit.util.BukkitWorld.getMaxWorldHeight(world) - 1
        );
-        ScopedQueueCoordinator offsetChunkQueue = new ScopedQueueCoordinator(wrapped, min, max);
-        this.plotGenerator.populateChunk(offsetChunkQueue, area);
+        if (this.plotGenerator.populateChunk(chunk, area)) {
+            this.queue.enqueue();
+        }
    }

 }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
@@ -49,7 +49,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 +73,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 +112,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,44 +154,12 @@ 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);
@@ -214,7 +201,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)) {
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/LegacyBlockStatePopulator.java
+++ b/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();
-    }
-
-}
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java
@@ -551,10 +551,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:
@@ -754,66 +750,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 +957,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;
                }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java
@@ -208,7 +208,7 @@ public class EntityEventListener implements Listener {
            }
            return;
        }
-        if (BukkitEntityUtil.checkEntity(entity, plot.getBasePlot(false))) {
+        if (BukkitEntityUtil.checkEntity(entity, plot)) {
            event.setCancelled(true);
        }
    }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitChunkCoordinator.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitChunkCoordinator.java
@@ -92,9 +92,9 @@ 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 boolean unloadAfter,
            @Assisted final @NonNull Collection<ProgressSubscriber> progressSubscribers,
-            @Assisted("forceSync") final boolean forceSync
+            @Assisted final boolean forceSync
    ) {
        this.requestedChunks = new LinkedBlockingQueue<>(requestedChunks);
        this.availableChunks = new LinkedBlockingQueue<>();
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java
@@ -235,7 +235,6 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
                        .withConsumer(consumer)
                        .unloadAfter(isUnloadAfter())
                        .withProgressSubscribers(getProgressSubscribers())
-                        .forceSync(isForceSync())
                        .build();
        return super.enqueue();
    }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java
@@ -110,7 +110,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;
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/LimitedRegionWrapperQueue.java
+++ b/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;
-    }
-
-}
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java
@@ -35,13 +35,11 @@ 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;
@@ -59,11 +57,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;
    }
@@ -237,37 +230,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;
--- a/CODE_OF_CONDUCT.md
+++ b/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.
--- a/Core/build.gradle.kts
+++ b/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) {
@@ -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 {
@@ -59,7 +59,7 @@ 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/4.9.3/")
+        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/")
    }
--- a/Core/src/main/java/com/plotsquared/core/PlotPlatform.java
+++ b/Core/src/main/java/com/plotsquared/core/PlotPlatform.java
@@ -359,9 +359,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;
--- a/Core/src/main/java/com/plotsquared/core/PlotSquared.java
+++ b/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);
@@ -1580,13 +1574,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 +1596,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);
-        }
-
-    }
-
 }
--- a/Core/src/main/java/com/plotsquared/core/command/Deny.java
+++ b/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;
        }
--- a/Core/src/main/java/com/plotsquared/core/command/Music.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Music.java
@@ -62,7 +62,7 @@ public class Music extends SubCommand {
            .asList("music_disc_13", "music_disc_cat", "music_disc_blocks", "music_disc_chirp",
                    "music_disc_far", "music_disc_mall", "music_disc_mellohi", "music_disc_stal",
                    "music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait", "music_disc_otherside",
-                    "music_disc_pigstep", "music_disc_5"
+                    "music_disc_pigstep"
            );

    private final InventoryUtil inventoryUtil;
--- a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java
+++ b/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."})
@@ -634,10 +634,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;
--- a/Core/src/main/java/com/plotsquared/core/generator/AugmentedUtils.java
+++ b/Core/src/main/java/com/plotsquared/core/generator/AugmentedUtils.java
@@ -64,7 +64,7 @@ public class AugmentedUtils {
     * @param chunkZ Chunk Z position
     * @param queue  Queue to write to, if desired.
     * @return true if generation occurred.
-     * @since 6.8.0
+     * @since TODO
     */
    public static boolean generateChunk(
            final @NonNull String world,
@@ -187,7 +187,7 @@ public class AugmentedUtils {
     * @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")
+    @Deprecated(forRemoval = true, since = "TODO")
    public static boolean generate(
            @Nullable Object chunkObject,
            final @NonNull String world,
--- a/Core/src/main/java/com/plotsquared/core/generator/HybridGen.java
+++ b/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,9 +69,7 @@ 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]);
-                    }
+                    result.setBlock(x, minY + y, z, blocks[y]);
                }
            }
        }
@@ -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.getMinGenHeight() + (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);
-        }
-
-    }
-
 }
--- a/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java
+++ b/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,24 +71,15 @@ public class HybridPlotWorld extends ClassicPlotWorld {
    private static final AffineTransform transform = new AffineTransform().rotateY(90);
    public boolean ROAD_SCHEMATIC_ENABLED;
    public boolean PLOT_SCHEMATIC = false;
-    @Deprecated(forRemoval = true, since = "6.9.0")
    public int PLOT_SCHEMATIC_HEIGHT = -1;
    public short PATH_WIDTH_LOWER;
    public short PATH_WIDTH_UPPER;
    public HashMap<Integer, BaseBlock[]> G_SCH;
    public HashMap<Integer, BiomeType> G_SCH_B;
-    /**
-     * The Y level at which schematic generation will start, lowest of either road or plot schematic generation.
-     */
    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;
@@ -111,7 +98,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);
@@ -119,7 +105,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);
@@ -127,6 +112,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();
@@ -264,69 +251,37 @@ 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);

        SCHEM_Y = schematicStartHeight();
-
-        // plotY and roadY are important to allow plot and/or road schematic "overflow" into each other without causing AIOOB
-        //  exceptions when attempting either to set blocks to, or get block from G_SCH
-        // Default plot schematic start height, normalized to the minimum height schematics are pasted from.
        int plotY = PLOT_HEIGHT - SCHEM_Y;
        int minRoadWall = Settings.Schematics.USE_WALL_IN_ROAD_SCHEM_HEIGHT ? Math.min(ROAD_HEIGHT, WALL_HEIGHT) : ROAD_HEIGHT;
-        // Default road schematic start height, normalized to the minimum height schematics are pasted from.
        int roadY = minRoadWall - SCHEM_Y;

-        int worldGenHeight = getMaxGenHeight() - getMinGenHeight() + 1;
-
-        int maxSchematicHeight = 0;
+        int worldHeight = getMaxGenHeight() - getMinGenHeight() + 1;

        // SCHEM_Y should be normalised to the plot "start" height
        if (schematic3 != null) {
-            if ((maxSchematicHeight = schematic3.getClipboard().getDimensions().getY()) == worldGenHeight) {
-                SCHEM_Y = getMinGenHeight();
-                plotY = 0;
+            if (schematic3.getClipboard().getDimensions().getY() == worldHeight) {
+                SCHEM_Y = plotY = 0;
            } else if (!Settings.Schematics.PASTE_ON_TOP) {
-                SCHEM_Y = getMinBuildHeight();
-                plotY = 0;
+                SCHEM_Y = plotY = getMinBuildHeight() - getMinGenHeight();
            }
        }

        if (schematic1 != null) {
-            if ((maxSchematicHeight = Math.max(
-                    schematic1.getClipboard().getDimensions().getY(),
-                    maxSchematicHeight
-            )) == worldGenHeight) {
-                SCHEM_Y = getMinGenHeight();
-                roadY = 0; // Road is the lowest schematic
-                if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != worldGenHeight) {
-                    // Road is the lowest schematic. Normalize plotY to it.
-                    if (Settings.Schematics.PASTE_ON_TOP) {
-                        plotY = PLOT_HEIGHT - getMinGenHeight();
-                    } else {
-                        plotY = getMinBuildHeight() - getMinGenHeight();
-                    }
+            if (schematic1.getClipboard().getDimensions().getY() == worldHeight) {
+                SCHEM_Y = roadY = getMinGenHeight();
+                if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != worldHeight
+                        && !Settings.Schematics.PASTE_ON_TOP) {
+                    plotY = PLOT_HEIGHT;
                }
            } else if (!Settings.Schematics.PASTE_ROAD_ON_TOP) {
-                if (SCHEM_Y == getMinGenHeight()) { // Only possible if plot schematic is enabled
-                    // Plot is still the lowest schematic, normalize roadY to it
-                    roadY = getMinBuildHeight() - getMinGenHeight();
-                } else if (schematic3 != null) {
-                    SCHEM_Y = getMinBuildHeight();
-                    roadY = 0;// Road is the lowest schematic
-                    if (Settings.Schematics.PASTE_ON_TOP) {
-                        // Road is the lowest schematic. Normalize plotY to it.
-                        plotY = PLOT_HEIGHT - getMinBuildHeight();
-                    }
-                    // If plot schematic is not paste-on-top, it will be from min build height thus plotY = 0 as well already.
+                SCHEM_Y = roadY = getMinBuildHeight();
+                if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != worldHeight
+                        && !Settings.Schematics.PASTE_ON_TOP) {
+                    plotY = PLOT_HEIGHT;
                }
            }
        }
@@ -359,32 +314,24 @@ 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(
-                                x + min.getBlockX(),
-                                y + min.getBlockY(),
-                                z + min.getBlockZ()
-                        ));
-                        schem3PopulationNeeded |= id.hasNbtData();
-                        addOverlayBlock(
-                                (short) (x + shift + oddshift + centerShiftX),
-                                (short) (y + plotY),
-                                (short) (z + shift + oddshift + centerShiftZ),
-                                id,
-                                false,
-                                maxSchematicHeight
-                        );
-                    }
-                    if (blockArrayClipboard3.hasBiomes()) {
-                        BiomeType biome = blockArrayClipboard3.getBiome(BlockVector2.at(
-                                x + min.getBlockX(),
-                                z + min.getBlockZ()
-                        ));
-                        addOverlayBiome(
-                                (short) (x + shift + oddshift + centerShiftX),
-                                (short) (z + shift + oddshift + centerShiftZ),
-                                biome
-                        );
+                        BaseBlock id =
+                                blockArrayClipboard3.getFullBlock(BlockVector3.at(
+                                        x + min.getBlockX(),
+                                        y + min.getBlockY(),
+                                        z + min.getBlockZ()
+                                ));
+                        if (!id.getBlockType().getMaterial().isAir()) {
+                            addOverlayBlock((short) (x + shift + oddshift + centerShiftX), (short) (y + plotY),
+                                    (short) (z + shift + oddshift + centerShiftZ), id, false, h3
+                            );
+                        }
                    }
+                    BiomeType biome = blockArrayClipboard3.getBiome(BlockVector2.at(x + min.getBlockX(), z + min.getBlockZ()));
+                    addOverlayBiome(
+                            (short) (x + shift + oddshift + centerShiftX),
+                            (short) (z + shift + oddshift + centerShiftZ),
+                            biome
+                    );
                }
            }

@@ -392,7 +339,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                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");
            }
@@ -422,29 +369,21 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                            y + min.getBlockY(),
                            z + min.getBlockZ()
                    ));
-                    schem1PopulationNeeded |= id.hasNbtData();
-                    addOverlayBlock(
-                            (short) (x - shift),
-                            (short) (y + roadY),
-                            (short) (z + shift + oddshift),
-                            id,
-                            false,
-                            maxSchematicHeight
-                    );
-                    addOverlayBlock(
-                            (short) (z + shift + oddshift),
-                            (short) (y + roadY),
-                            (short) (shift - x + (oddshift - 1)),
-                            id,
-                            true,
-                            maxSchematicHeight
-                    );
-                }
-                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);
+                    if (!id.getBlockType().getMaterial().isAir()) {
+                        addOverlayBlock((short) (x - shift), (short) (y + roadY), (short) (z + shift + oddshift), id, false, h1);
+                        addOverlayBlock(
+                                (short) (z + shift + oddshift),
+                                (short) (y + roadY),
+                                (short) (shift - x + (oddshift - 1)),
+                                id,
+                                true,
+                                h1
+                        );
+                    }
                }
+                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);
            }
        }

@@ -466,28 +405,16 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                            y + min.getBlockY(),
                            z + min.getBlockZ()
                    ));
-                    schem2PopulationNeeded |= id.hasNbtData();
-                    addOverlayBlock(
-                            (short) (x - shift),
-                            (short) (y + roadY),
-                            (short) (z - shift),
-                            id,
-                            false,
-                            maxSchematicHeight
-                    );
-                }
-                if (blockArrayClipboard2.hasBiomes()) {
-                    BiomeType biome = blockArrayClipboard2.getBiome(BlockVector2.at(x + min.getBlockX(), z + min.getBlockZ()));
-                    addOverlayBiome((short) (x - shift), (short) (z - shift), biome);
+                    if (!id.getBlockType().getMaterial().isAir()) {
+                        addOverlayBlock((short) (x - shift), (short) (y + roadY), (short) (z - shift), id, false, h2);
+                    }
                }
+                BiomeType biome = blockArrayClipboard2.getBiome(BlockVector2.at(x + min.getBlockX(), z + min.getBlockZ()));
+                addOverlayBiome((short) (x - shift), (short) (z - shift), biome);
            }
        }
    }

-    /**
-     * @deprecated This method should not be available for public API usage and will be made private.
-     */
-    @Deprecated(forRemoval = true, since = "TODO")
    public void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate, int height) {
        if (z < 0) {
            z += this.SIZE;
@@ -514,10 +441,6 @@ public class HybridPlotWorld extends ClassicPlotWorld {
        existing[y] = id;
    }

-    /**
-     * @deprecated This method should not be available for public API usage and will be made private.
-     */
-    @Deprecated(forRemoval = true, since = "TODO")
    public void addOverlayBiome(short x, short z, BiomeType id) {
        if (z < 0) {
            z += this.SIZE;
@@ -533,52 +456,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;
-    }
-
 }
--- a/Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java
+++ b/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;
    }

--- a/Core/src/main/java/com/plotsquared/core/inject/factory/ChunkCoordinatorFactory.java
+++ b/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
    );

 }
--- a/Core/src/main/java/com/plotsquared/core/location/Location.java
+++ b/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
    ) {
--- a/Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java
+++ b/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;
-    }
-
-}
--- a/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
+++ b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
@@ -65,6 +65,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;
@@ -964,31 +965,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 +1028,6 @@ public abstract class PlotArea {
            }
        }
        manager.finishPlotMerge(plotIds, queue);
-        if (whenDone != null) {
-            queue.setCompleteTask(whenDone);
-        }
        queue.enqueue();
        return true;
    }
@@ -1405,7 +1379,7 @@ public abstract class PlotArea {
    }

    /**
-     * Get the min height from which PlotSquared will generate blocks. Inclusive.
+     * Get the min height from which P2 will generate blocks. Inclusive.
     *
     * @since 6.6.0
     */
@@ -1414,7 +1388,7 @@ public abstract class PlotArea {
    }

    /**
-     * Get the max height to which PlotSquared will generate blocks. Inclusive.
+     * Get the max height to which P2 will generate blocks. Inclusive.
     *
     * @since 6.6.0
     */
--- a/Core/src/main/java/com/plotsquared/core/plot/PlotAreaTerrainType.java
+++ b/Core/src/main/java/com/plotsquared/core/plot/PlotAreaTerrainType.java
@@ -44,7 +44,7 @@ public enum PlotAreaTerrainType {
    ORE,

    /**
-     * Generate everything using the vanilla generator but with PlotSquared roads.
+     * Generate everything using the vanilla generator but with PS roads.
     */
    ROAD,

--- a/Core/src/main/java/com/plotsquared/core/plot/flag/types/ListFlag.java
+++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/ListFlag.java
@@ -43,7 +43,7 @@ public abstract class ListFlag<V, F extends PlotFlag<List<V>, F>> extends PlotFl
    @Override
    public F merge(@NonNull List<V> newValue) {
        final List<V> mergedList = new ArrayList<>();
-        // If a server already used PlotSquared before this fix, we remove all present duplicates on an eventual merge
+        // If a server already used PS before this fix, we remove all present duplicates on an eventual merge
        for (final V v : getValue()) {
            if (!mergedList.contains(v)) {
                mergedList.add(v);
--- a/Core/src/main/java/com/plotsquared/core/queue/BlockArrayCacheScopedQueueCoordinator.java
+++ b/Core/src/main/java/com/plotsquared/core/queue/BlockArrayCacheScopedQueueCoordinator.java
@@ -64,7 +64,7 @@ public class BlockArrayCacheScopedQueueCoordinator extends ScopedQueueCoordinato
     *
     * @param min Inclusive location of the minimum point to limit the scope to.
     * @param max Inclusive location of the maximum point to limit the scope to.
-     * @since 6.8.0
+     * @since TODO
     */
    public BlockArrayCacheScopedQueueCoordinator(Location min, Location max) {
        super(null, min, max);
--- a/Core/src/main/java/com/plotsquared/core/queue/ChunkCoordinatorBuilder.java
+++ b/Core/src/main/java/com/plotsquared/core/queue/ChunkCoordinatorBuilder.java
@@ -58,7 +58,6 @@ public class ChunkCoordinatorBuilder {
    private long maxIterationTime = Settings.QUEUE.MAX_ITERATION_TIME; // A little over 1 tick;
    private int initialBatchSize = Settings.QUEUE.INITIAL_BATCH_SIZE;
    private boolean unloadAfter = true;
-    private boolean forceSync = false;

    @Inject
    public ChunkCoordinatorBuilder(@NonNull ChunkCoordinatorFactory chunkCoordinatorFactory) {
@@ -198,18 +197,6 @@ public class ChunkCoordinatorBuilder {
        return this;
    }

-    /**
-     * Set whether the chunks coordinator should be forced to be synchronous. This is not necessarily synchronous to the server,
-     * and simply effectively makes {@link ChunkCoordinator#start()} ()} a blocking operation.
-     *
-     * @param forceSync force sync or not
-     * @since 6.9.0
-     */
-    public @NonNull ChunkCoordinatorBuilder forceSync(final boolean forceSync) {
-        this.forceSync = forceSync;
-        return this;
-    }
-
    public @NonNull ChunkCoordinatorBuilder withProgressSubscriber(ProgressSubscriber progressSubscriber) {
        this.progressSubscribers.add(progressSubscriber);
        return this;
@@ -240,8 +227,7 @@ public class ChunkCoordinatorBuilder {
                        this.whenDone,
                        this.throwableConsumer,
                        this.unloadAfter,
-                        this.progressSubscribers,
-                        this.forceSync
+                        this.progressSubscribers
                );
    }

--- a/Core/src/main/java/com/plotsquared/core/queue/ChunkQueueCoordinator.java
+++ b/Core/src/main/java/com/plotsquared/core/queue/ChunkQueueCoordinator.java
@@ -39,9 +39,9 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 * Queue that is limited to a single chunk. It does not allow a delegate queue and should be treated as a cache for changes to
 * be set to. Does not support tile entities or entities.
 *
- * @deprecated This class is poorly designed and will no longer be used in PlotSquared
+ * @deprecated This class is poorly designed and will no longer be used in P2
 */
-@Deprecated(forRemoval = true, since = "6.8.0")
+@Deprecated(forRemoval = true, since = "TODO")
 public class ChunkQueueCoordinator extends ScopedQueueCoordinator {

    public final BiomeType[][][] biomeResult;
--- a/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java
+++ b/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java
@@ -40,12 +40,14 @@ import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;

 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;

 public abstract class QueueCoordinator {
@@ -91,9 +93,7 @@ public abstract class QueueCoordinator {
     * @param z chunk z coordinate
     * @return a new {@link ScopedQueueCoordinator}
     * @since 6.6.0
-     * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7.
     */
-    @Deprecated(forRemoval = true, since = "6.9.0")
    public ScopedQueueCoordinator getForChunk(int x, int z, int minY, int maxY) {
        int bx = x << 4;
        int bz = z << 4;
@@ -117,8 +117,7 @@ public abstract class QueueCoordinator {
    public abstract void setModified(long modified);

    /**
-     * Returns true if the queue should be forced to be synchronous when enqueued. This is not necessarily synchronous to the
-     * server, and simply effectively makes {@link QueueCoordinator#enqueue()} a blocking operation.
+     * Returns true if the queue should be forced to be synchronous when enqueued.
     *
     * @return is force sync
     */
@@ -127,8 +126,7 @@ public abstract class QueueCoordinator {
    }

    /**
-     * Set whether the queue should be forced to be synchronous. This is not necessarily synchronous to the server, and simply
-     * effectively makes {@link QueueCoordinator#enqueue()} a blocking operation.
+     * Set whether the queue should be forced to be synchronous
     *
     * @param forceSync force sync or not
     */
@@ -255,7 +253,7 @@ public abstract class QueueCoordinator {
     * If the queue should accept biome placement
     *
     * @param enabled If biomes should be enabled
-     * @since 6.8.0
+     * @since TODO
     */
    public abstract void setBiomesEnabled(boolean enabled);

--- a/Core/src/main/java/com/plotsquared/core/queue/ScopedQueueCoordinator.java
+++ b/Core/src/main/java/com/plotsquared/core/queue/ScopedQueueCoordinator.java
@@ -40,7 +40,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 *
 * @deprecated This should be renamed to NormalizedScopedQueueCoordinator or something.
 */
-@Deprecated(forRemoval = true, since = "6.8.0")
+@Deprecated(forRemoval = true, since = "TODO")
 public class ScopedQueueCoordinator extends DelegateQueueCoordinator {

    private final Location min;
--- a/Core/src/main/java/com/plotsquared/core/util/ChunkManager.java
+++ b/Core/src/main/java/com/plotsquared/core/util/ChunkManager.java
@@ -42,10 +42,6 @@ public abstract class ChunkManager {
    private static final Map<BlockVector2, RunnableVal<ScopedQueueCoordinator>> forceChunks = new ConcurrentHashMap<>();
    private static final Map<BlockVector2, RunnableVal<ScopedQueueCoordinator>> addChunks = new ConcurrentHashMap<>();

-    /**
-     * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7.
-     */
-    @Deprecated(forRemoval = true, since = "6.9.0")
    public static void setChunkInPlotArea(
            RunnableVal<ScopedQueueCoordinator> force,
            RunnableVal<ScopedQueueCoordinator> add,
@@ -83,10 +79,6 @@ public abstract class ChunkManager {
        }
    }

-    /**
-     * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7.
-     */
-    @Deprecated(forRemoval = true, since = "6.9.0")
    public static boolean preProcessChunk(BlockVector2 loc, ScopedQueueCoordinator queue) {
        final RunnableVal<ScopedQueueCoordinator> forceChunk = forceChunks.get(loc);
        if (forceChunk != null) {
@@ -97,10 +89,6 @@ public abstract class ChunkManager {
        return false;
    }

-    /**
-     * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7.
-     */
-    @Deprecated(forRemoval = true, since = "6.9.0")
    public static boolean postProcessChunk(BlockVector2 loc, ScopedQueueCoordinator queue) {
        final RunnableVal<ScopedQueueCoordinator> addChunk = forceChunks.get(loc);
        if (addChunk != null) {
--- a/Core/src/main/java/com/plotsquared/core/util/RegionManager.java
+++ b/Core/src/main/java/com/plotsquared/core/util/RegionManager.java
@@ -174,7 +174,7 @@ public abstract class RegionManager {
     * @param whenDone task to run when complete
     * @param manager  plot manager
     * @param actor    the player running the clear
-     * @return {@code true} if the clear worked. {@code false} if someone went wrong so PlotSquared can then handle the clear
+     * @return {@code true} if the clear worked. {@code false} if someone went wrong so P2 can then handle the clear
     */
    public abstract boolean handleClear(
            @NonNull Plot plot,
--- a/Core/src/main/java/com/plotsquared/core/util/RegionUtil.java
+++ b/Core/src/main/java/com/plotsquared/core/util/RegionUtil.java
@@ -109,7 +109,7 @@ public class RegionUtil {
        return new Rectangle2D.Double(min.getX(), min.getZ(), max.getX(), max.getZ());
    }

-    // Because WorldEdit (not FastAsyncWorldEdit) lack this for CuboidRegion
+    // Because WE (not fawe) lack this for CuboidRegion
    public static boolean intersects(CuboidRegion region, CuboidRegion other) {
        BlockVector3 regionMin = region.getMinimumPoint();
        BlockVector3 regionMax = region.getMaximumPoint();
--- a/Core/src/main/java/com/plotsquared/core/util/TabCompletions.java
+++ b/Core/src/main/java/com/plotsquared/core/util/TabCompletions.java
@@ -167,7 +167,7 @@ public final class TabCompletions {
    }

    /**
-     * Get a list of completions corresponding to WorldEdit(/FastAsyncWorldEdit) patterns. This uses
+     * Get a list of completions corresponding to WorldEdit(/FAWE) patterns. This uses
     * WorldEdit's pattern completer internally.
     *
     * @param input Command input
--- a/Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java
+++ b/Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java
@@ -38,7 +38,6 @@ import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.flag.GlobalFlagContainer;
 import com.plotsquared.core.plot.flag.PlotFlag;
-import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag;
 import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.PlayerManager;
 import net.kyori.adventure.text.Component;
@@ -111,9 +110,6 @@ public final class PlaceholderRegistry {
            return plot.getAlias();
        });
        this.createPlaceholder("currentplot_owner", (player, plot) -> {
-            if (plot.getFlag(ServerPlotFlag.class)){
-                return legacyComponent(TranslatableCaption.of("info.server"), player);
-            }
            final UUID plotOwner = plot.getOwnerAbs();
            if (plotOwner == null) {
                return legacyComponent(TranslatableCaption.of("generic.generic_unowned"), player);
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-    <img src="https://raw.githubusercontent.com/IntellectualSites/Assets/main/plugins/PlotSquared/PlotSquared.svg" width="250">
+    <img src="https://i.imgur.com/33Y65YL.png" width="150">
 </p>

 ---
@@ -41,20 +41,15 @@ is to provide a lag-free and smooth experience.
 * [Plot2Dynmap](http://www.spigotmc.org/resources/plot2dynmap.1292/)
 * [HoloPlots](https://www.spigotmc.org/resources/holoplots.4880/)
 * [PlotHider](https://www.spigotmc.org/resources/plot-hider.20701/)
+### Unmaintained or integrated into PlotSquared  
+* [AdvPlots](http://www.spigotmc.org/resources/advplots-%CE%B2.1500/)
+* [PlotRankup](http://www.spigotmc.org/resources/plotrankup.1571/)
+* [PlotZSux](https://www.spigotmc.org/resources/plotzsux.9563/)
+* [IslandPlots](https://www.spigotmc.org/resources/islandplots.9421/)
+* [BiomeGenerator](https://www.spigotmc.org/resources/biomegenerator.1663/)
+* [PlotSquaredMG](https://www.spigotmc.org/resources/plotsquaredmg.8025/)
+* [BasicPlots](https://www.spigotmc.org/resources/basicplots.6901/)

-### Edit The Code
-
-Want to add new features to PlotSquared or fix bugs yourself? You can get the game running, with PlotSquared, from the code here:
-
-For additional information about compiling PlotSquared, see [CONTRIBUTING.md](https://github.com/IntellectualSites/.github/blob/main/CONTRIBUTING.md)
-
-### Submitting Your Changes
-PlotSquared is open source (specifically licensed under GPL v3), so note that your contributions will also be open source. The best way to submit a change is to create a fork on GitHub, put your changes there, and then create a "pull request" on our PlotSquared repository.
-
-<a href="https://yourkit.com/">
-    <img src="https://www.yourkit.com/images/yklogo.png">
-</a>
-
-Thank you to YourKit for supporting our product by providing us with their innovative and intelligent tools
-for monitoring and profiling Java and .NET applications.
-YourKit is the creator of [YourKit Java Profiler](https://www.yourkit.com/java/profiler/), [YourKit .NET Profiler](https://www.yourkit.com/.net/profiler/), and [YourKit YouMonitor](https://www.yourkit.com/youmonitor/).
+# Sponsors
+Our official sponsor list can be found [here](https://intellectualsites.github.io/download/sponsors.html). <br>
+If you are interested and want to be listed here, [contact us](https://intellectualsites.github.io/download/contact.html).
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,11 +18,10 @@ plugins {
    idea
 }

-group = "com.plotsquared"
-version = "6.9.1-SNAPSHOT"
+version = "6.7.1-SNAPSHOT"

-subprojects {
-    group = rootProject.group
+allprojects {
+    group = "com.plotsquared"
    version = rootProject.version

    repositories {
@@ -35,7 +34,7 @@ subprojects {

        maven {
            name = "Sonatype OSS (S01)"
-            url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+            url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots")
        }

        maven {
@@ -51,7 +50,9 @@ subprojects {
            url = uri("https://maven.enginehub.org/repo/")
        }
    }
+}

+subprojects {
    apply {
        plugin<JavaPlugin>()
        plugin<JavaLibraryPlugin>()
@@ -63,11 +64,10 @@ subprojects {
        plugin<EclipsePlugin>()
        plugin<IdeaPlugin>()
    }
+}

-    dependencies {
-        implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.5"))
-    }
-
+val javadocDir = rootDir.resolve("docs").resolve("javadoc").resolve(project.name)
+allprojects {
    dependencies {
        // Tests
        testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
@@ -162,7 +162,7 @@ subprojects {
                        developerConnection.set("scm:git://github.com/IntellectualSites/PlotSquared.git")
                    }

-                    issueManagement {
+                    issueManagement{
                        system.set("GitHub")
                        url.set("https://github.com/IntellectualSites/PlotSquared/issues")
                    }
@@ -172,6 +172,11 @@ subprojects {
    }

    tasks {
+        named<Delete>("clean") {
+            doFirst {
+                javadocDir.deleteRecursively()
+            }
+        }

        compileJava {
            options.compilerArgs.addAll(arrayOf("-Xmaxerrs", "1000"))
@@ -182,9 +187,20 @@ subprojects {
            options.encoding = "UTF-8"
        }

+        javadoc {
+            val opt = options as StandardJavadocDocletOptions
+            opt.addStringOption("Xdoclint:none", "-quiet")
+            opt.tags(
+                    "apiNote:a:API Note:",
+                    "implSpec:a:Implementation Requirements:",
+                    "implNote:a:Implementation Note:"
+            )
+        }
+
        shadowJar {
            this.archiveClassifier.set(null as String?)
            this.archiveFileName.set("${project.name}-${project.version}.${this.archiveExtension.getOrElse("jar")}")
+            this.destinationDirectory.set(rootProject.tasks.shadowJar.get().destinationDirectory.get())
        }

        named("build") {
@@ -194,6 +210,7 @@ subprojects {
            useJUnitPlatform()
        }
    }
+
 }

 nexusPublishing {
@@ -205,6 +222,36 @@ nexusPublishing {
    }
 }

-tasks.getByName<Jar>("jar") {
-    enabled = false
+tasks {
+    val aggregatedJavadocs = create<Javadoc>("aggregatedJavadocs") {
+        title = "${project.name} ${project.version} API"
+        setDestinationDir(javadocDir)
+        options.destinationDirectory = javadocDir
+
+        doFirst {
+            javadocDir.deleteRecursively()
+        }
+    }.also {
+        it.group = "Documentation"
+        it.description = "Generate javadocs from all child projects as if it was a single project"
+    }
+
+    subprojects.forEach { subProject ->
+        subProject.afterEvaluate {
+            subProject.tasks.withType<Javadoc>().forEach { task ->
+                aggregatedJavadocs.source += task.source
+                aggregatedJavadocs.classpath += task.classpath
+                aggregatedJavadocs.excludes += task.excludes
+                aggregatedJavadocs.includes += task.includes
+
+                val rootOptions = aggregatedJavadocs.options as StandardJavadocDocletOptions
+                val subOptions = task.options as StandardJavadocDocletOptions
+                rootOptions.links(*subOptions.links.orEmpty().minus(rootOptions.links.orEmpty().toSet()).toTypedArray())
+            }
+        }
+    }
+
+    build {
+        dependsOn(aggregatedJavadocs)
+    }
 }
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,12 +1,25 @@
 [versions]
+# Minecraft expectations
+gson = "2.8.8" # Version set by Minecraft
+log4j-api = "2.17.1" # Version set by Minecraft
+guava = "31.0.1-jre" # Version set by Minecraft
+
 # Platform expectations
 paper = "1.18.1-R0.1-SNAPSHOT"
 checker-qual = "3.22.0"
 guice = "5.1.0"
 spotbugs = "4.7.0"
+snakeyaml = "1.30" # Version set by Bukkit
+
+# Adventure & MiniMessage
+adventure-api = "4.9.3"
+adventure-text-minimessage = "4.1.0-SNAPSHOT"
+adventure-platform-bukkit = "4.0.1"

 # Plugins
 worldedit = "7.2.10"
+fawe = "2.1.2"
+vault = "1.7.1"
 placeholderapi = "2.11.1"
 luckperms = "5.4"
 essentialsx = "2.19.4"
@@ -17,7 +30,11 @@ prtree = "2.0.0"
 aopalliance = "1.0"
 cloud-services = "1.6.2"
 arkitektonika = "2.1.1"
+paster = "1.1.4"
+bstats = "3.0.0"
+paperlib = "1.0.7"
 squirrelid = "0.3.1"
+serverlib = "2.3.1"
 http4j = "1.3"

 # Gradle plugins
@@ -31,14 +48,27 @@ nexus = "1.1.0"
 paper = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" }
 checkerqual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checker-qual" }

+# Minecraft expectations
+gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
+log4j = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j-api" }
+
 # Platform expectations
+snakeyaml = { group = "org.yaml", name = "snakeyaml", version.ref = "snakeyaml" }
 guice = { group = "com.google.inject", name = "guice", version.ref = "guice" }
 guiceassistedinject = { group = "com.google.inject.extensions", name = "guice-assistedinject", version.ref = "guice" }
 spotbugs = { group = "com.github.spotbugs", name = "spotbugs-annotations", version.ref = "spotbugs" }

+# Adventure & MiniMessage
+adventure = { group = "net.kyori", name = "adventure-api", version.ref = "adventure-api" }
+minimessage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "adventure-text-minimessage" }
+adventurePlatformBukkit = { group = "net.kyori", name = "adventure-platform-bukkit", version.ref = "adventure-platform-bukkit" }
+
 # Plugins
 worldeditCore = { group = "com.sk89q.worldedit", name = "worldedit-core", version.ref = "worldedit" }
 worldeditBukkit = { group = "com.sk89q.worldedit", name = "worldedit-bukkit", version.ref = "worldedit" }
+fastasyncworldeditBukkit = { group = "com.fastasyncworldedit", name = "FastAsyncWorldEdit-Bukkit", version.ref = "fawe" }
+fastasyncworldeditCore = { group = "com.fastasyncworldedit", name = "FastAsyncWorldEdit-Core", version.ref = "fawe" }
+vault = { group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault" }
 placeholderapi = { group = "me.clip", name = "placeholderapi", version.ref = "placeholderapi" }
 luckperms = { group = "net.luckperms", name = "api", version.ref = "luckperms" }
 essentialsx = { group = "net.essentialsx", name = "EssentialsX", version.ref = "essentialsx" }
@@ -49,8 +79,13 @@ aopalliance = { group = "aopalliance", name = "aopalliance", version.ref = "aopa
 cloudServices = { group = "cloud.commandframework", name = "cloud-services", version.ref = "cloud-services" }
 mvdwapi = { group = "com.intellectualsites.mvdwplaceholderapi", name = "MVdWPlaceholderAPI", version.ref = "mvdwapi" }
 squirrelid = { group = "org.enginehub", name = "squirrelid", version.ref = "squirrelid" }
+serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.ref = "serverlib" }
+bstats = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats" }
+paperlib = { group = "io.papermc", name = "paperlib", version.ref = "paperlib" }
 arkitektonika = { group = "com.intellectualsites.arkitektonika", name = "Arkitektonika-Client", version.ref = "arkitektonika" }
 http4j = { group = "com.intellectualsites.http", name = "HTTP4J", version.ref = "http4j" }
+paster = { group = "com.intellectualsites.paster", name = "Paster", version.ref = "paster" }
+guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }

 [plugins]
 shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
--- a/plotsquared-logo.png
+++ b/plotsquared-logo.png
--- a/renovate.json
+++ b/renovate.json
@@ -3,9 +3,17 @@
    "config:base",
    ":disableDependencyDashboard"
  ],
+  "ignoreDeps": [
+    "guava",
+    "com.google.guava:guava",
+    "com.google.code.gson:gson",
+    "gson",
+    "snakeyaml",
+    "net.kyori"
+  ],
  "timezone": "Europe/Berlin",
  "schedule": [
-    "every monday"
+    "on monday after 9am"
  ],
  "labels": ["Renovate"],
  "commitMessagePrefix": "build: ",