build: Update dependency cloud.commandframework:cloud-services to v1.6.2

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -27,12 +27,13 @@ body:
       description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
       multiple: false
       options:
-        - '1.19'
-        - '1.18.2'
         - '1.18.1'
         - '1.18'
         - '1.17.1'
         - '1.16.5'
+        - '1.15.2'
+        - '1.14.4'
+        - '1.13.2'
     validations:
       required: true
 

.github/workflows/build.yml

@@ -8,11 +8,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2.4.0
       - name: Validate Gradle Wrapper"
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v1.0.4
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v3.0.0
         with:
           distribution: temurin
           java-version: 17
@@ -40,27 +40,3 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
           ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
-      - name: Publish core javadoc
-        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}}
-        uses: cpina/github-action-push-to-another-repository@main
-        env:
-          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
-        with:
-          source-directory: 'Core/build/docs/javadoc'
-          destination-github-username: 'IntellectualSites'
-          destination-repository-name: 'plotsquared-javadocs'
-          user-email: ${{ secrets.USER_EMAIL }}
-          target-branch: main
-          target-directory: core
-      - name: Publish bukkit javadoc
-        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}}
-        uses: cpina/github-action-push-to-another-repository@main
-        env:
-          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
-        with:
-          source-directory: 'Bukkit/build/docs/javadoc'
-          destination-github-username: 'IntellectualSites'
-          destination-repository-name: 'plotsquared-javadocs'
-          user-email: ${{ secrets.USER_EMAIL }}
-          target-branch: main
-          target-directory: bukkit

.github/workflows/codeql.yml

@@ -23,15 +23,15 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v1
         with:
           languages: ${{ matrix.language }}
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v1
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v1

.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.18.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

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

.idea/icon.svg

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

.lift.toml

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

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 {
@@ -18,23 +18,23 @@ repositories {
 }
 
 dependencies {
-    api(projects.plotsquaredCore)
+    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 }
+    compileOnly(libs.fastasyncworldeditBukkit) { isTransitive = false }
-    testImplementation("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit") { isTransitive = false }
+    testImplementation(libs.fastasyncworldeditBukkit) { isTransitive = false }
-    compileOnly("com.github.MilkBowl:VaultAPI") {
+    compileOnly(libs.vault) {
         exclude(group = "org.bukkit")
     }
     compileOnly(libs.placeholderapi)
@@ -44,15 +44,15 @@ dependencies {
 
     // Other libraries
     implementation(libs.squirrelid) { isTransitive = false }
-    implementation("dev.notmyfault.serverlib:ServerLib")
+    implementation(libs.serverlib)
 
     // Our libraries
     implementation(libs.arkitektonika)
     implementation(libs.http4j)
-    implementation("com.intellectualsites.paster:Paster")
+    implementation(libs.paster)
 
     // Adventure
-    implementation("net.kyori:adventure-platform-bukkit")
+    implementation(libs.adventurePlatformBukkit)
 }
 
 tasks.processResources {
@@ -83,10 +83,8 @@ tasks.named<ShadowJar>("shadowJar") {
     relocate("org.jetbrains", "com.plotsquared.core.annotations")
     relocate("org.intellij.lang", "com.plotsquared.core.intellij.annotations")
     relocate("javax.annotation", "com.plotsquared.core.annotation")
-    relocate("com.github.spotbugs", "com.plotsquared.core.spotbugs")
+    relocate("com.google.code.findbugs", "com.plotsquared.core.findbugs")
     relocate("javax.inject", "com.plotsquared.core.annotation.inject")
-    relocate("net.jcip", "com.plotsquared.core.annotations.jcip")
-    relocate("edu.umd.cs.findbugs", "com.plotsquared.core.annotations.findbugs")
 
     // Get rid of all the libs which are 100% unused.
     minimize()
@@ -97,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://intellectualsites.github.io/plotsquared-javadocs/core/")
+        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/")
     }

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -231,16 +238,6 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
         return this.version;
     }
 
-    @Override
-    public int versionMinHeight() {
-        return serverVersion()[1] >= 18 ? -64 : 0;
-    }
-
-    @Override
-    public int versionMaxHeight() {
-        return serverVersion()[1] >= 18 ? 319 : 255;
-    }
-
     @Override
     public @NonNull String serverImplementation() {
         return Bukkit.getVersion();
@@ -263,7 +260,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
 
         final PlotSquared plotSquared = new PlotSquared(this, "Bukkit");
 
-        // FastAsyncWorldEdit
+        // FAWE
         if (Settings.FAWE_Components.FAWE_HOOK) {
             Plugin fawe = getServer().getPluginManager().getPlugin("FastAsyncWorldEdit");
             if (fawe != null) {
@@ -271,7 +268,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                     Class.forName("com.fastasyncworldedit.bukkit.regions.plotsquared.FaweQueueCoordinator");
                     faweHook = true;
                 } catch (Exception ignored) {
-                    LOGGER.error("Incompatible version of FastAsyncWorldEdit to enable hook, please upgrade: https://ci.athion" +
+                    LOGGER.error("Incompatible version of FAWE to enable hook, please upgrade: https://ci.athion" +
                             ".net/job/FastAsyncWorldEdit/");
                 }
             }
@@ -425,7 +422,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
 
         plotSquared.startExpiryTasks();
 
-        // Once the server has loaded force updating all generators known to PlotSquared
+        // Once the server has loaded force updating all generators known to P2
         TaskManager.runTaskLater(() -> PlotSquared.platform().setupUtils().updateGenerators(true), TaskTime.ticks(1L));
 
         // Services are accessed in order
@@ -506,10 +503,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                 this.backgroundPipeline.registerService(essentialsUUIDService);
             }
 
-            if (Settings.UUID.IMPROMPTU_SERVICE_MOJANG_API) {
             final SquirrelIdUUIDService impromptuMojangService = new SquirrelIdUUIDService(Settings.UUID.IMPROMPTU_LIMIT);
             this.impromptuPipeline.registerService(impromptuMojangService);
-            }
             final SquirrelIdUUIDService backgroundMojangService = new SquirrelIdUUIDService(Settings.UUID.BACKGROUND_LIMIT);
             this.backgroundPipeline.registerService(backgroundMojangService);
         } else {

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -18,18 +25,17 @@
  */
 package com.plotsquared.bukkit.generator;
 
-import com.plotsquared.bukkit.queue.LimitedRegionWrapperQueue;
+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.ChunkWrapper;
-import com.plotsquared.core.location.UncheckedWorldLocation;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.world.PlotAreaManager;
-import com.plotsquared.core.plot.world.SinglePlotArea;
+import com.plotsquared.core.queue.QueueCoordinator;
-import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
+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;
@@ -37,51 +43,32 @@ import java.util.Random;
 final class BlockStatePopulator extends BlockPopulator {
 
     private final IndependentPlotGenerator plotGenerator;
+    private final PlotAreaManager plotAreaManager;
 
-    /**
+    private QueueCoordinator queue;
-     * @since 6.9.0
-     */
-    public BlockStatePopulator(
-            final @NonNull IndependentPlotGenerator plotGenerator
-    ) {
-        this.plotGenerator = plotGenerator;
-    }
 
-    /**
-     * @deprecated Use {@link BlockStatePopulator#BlockStatePopulator(IndependentPlotGenerator)} as plotAreManager is unused
-     */
-    @Deprecated(forRemoval = true, since = "6.9.0")
     public BlockStatePopulator(
             final @NonNull IndependentPlotGenerator plotGenerator,
             final @NonNull PlotAreaManager plotAreaManager
     ) {
         this.plotGenerator = plotGenerator;
+        this.plotAreaManager = plotAreaManager;
     }
 
     @Override
-    public void populate(
+    public void populate(final @NonNull World world, final @NonNull Random random, final @NonNull Chunk source) {
-            @NonNull final WorldInfo worldInfo,
+        if (this.queue == null) {
-            @NonNull final Random random,
+            this.queue = PlotSquared.platform().globalBlockQueue().getNewQueue(new BukkitWorld(world));
-            final int chunkX,
+        }
-            final int chunkZ,
+        final PlotArea area = this.plotAreaManager.getPlotArea(world.getName(), null);
-            @NonNull final LimitedRegion limitedRegion
+        if (area == null) {
-    ) {
-        PlotArea area = UncheckedWorldLocation.at(worldInfo.getName(), chunkX << 4, 0, chunkZ << 4).getPlotArea();
-        if (area == null || (area instanceof HybridPlotWorld hpw && !hpw.populationNeeded()) || area instanceof SinglePlotArea) {
             return;
         }
-        LimitedRegionWrapperQueue wrapped = new LimitedRegionWrapperQueue(limitedRegion);
+        final ChunkWrapper wrap = new ChunkWrapper(area.getWorldName(), source.getX(), source.getZ());
-        // It is possible for the region to be larger than the chunk, but there is no reason for P2 to need to populate
+        final ScopedQueueCoordinator chunk = this.queue.getForChunk(wrap.x, wrap.z);
-        // outside of the actual chunk area.
+        if (this.plotGenerator.populateChunk(chunk, area)) {
-        Location min = UncheckedWorldLocation.at(worldInfo.getName(), chunkX << 4, worldInfo.getMinHeight(), chunkZ << 4);
+            this.queue.enqueue();
-        Location max = UncheckedWorldLocation.at(
+        }
-                worldInfo.getName(),
-                (chunkX << 4) + 15,
-                worldInfo.getMaxHeight(),
-                (chunkZ << 4) + 15
-        );
-        ZeroedDelegateScopedQueueCoordinator offsetChunkQueue = new ZeroedDelegateScopedQueueCoordinator(wrapped, min, max);
-        this.plotGenerator.populateChunk(offsetChunkQueue, area);
     }
 
 }

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -18,11 +25,7 @@
  */
 package com.plotsquared.bukkit.generator;
 
-import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.generator.AugmentedUtils;
-import com.plotsquared.core.queue.QueueCoordinator;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.util.SideEffectSet;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.generator.BlockPopulator;
@@ -49,14 +52,7 @@ public class BukkitAugmentedGenerator extends BlockPopulator {
 
     @Override
     public void populate(@NonNull World world, @NonNull Random random, @NonNull Chunk source) {
-        QueueCoordinator queue = PlotSquared.platform().globalBlockQueue().getNewQueue(BukkitAdapter.adapt(world));
+        AugmentedUtils.generate(source, world.getName(), source.getX(), source.getZ(), null);
-        // The chunk is already loaded and we do not want to load the chunk in "fully" by using any PaperLib methods.
-        queue.setForceSync(true);
-        queue.setSideEffectSet(SideEffectSet.none());
-        queue.setBiomesEnabled(false);
-        queue.setChunkObject(source);
-        AugmentedUtils.generateChunk(world.getName(), source.getX(), source.getZ(), queue);
-        queue.enqueue();
     }
 
 }

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -20,41 +27,29 @@ package com.plotsquared.bukkit.generator;
 
 import com.plotsquared.bukkit.queue.GenChunk;
 import com.plotsquared.bukkit.util.BukkitUtil;
-import com.plotsquared.bukkit.util.BukkitWorld;
 import com.plotsquared.core.PlotSquared;
-import com.plotsquared.core.generator.ClassicPlotWorld;
 import com.plotsquared.core.generator.GeneratorWrapper;
 import com.plotsquared.core.generator.IndependentPlotGenerator;
 import com.plotsquared.core.generator.SingleWorldGenerator;
 import com.plotsquared.core.location.ChunkWrapper;
-import com.plotsquared.core.location.UncheckedWorldLocation;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.world.PlotAreaManager;
-import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
+import com.plotsquared.core.queue.ScopedQueueCoordinator;
 import com.plotsquared.core.util.ChunkManager;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.math.BlockVector2;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.bukkit.HeightMap;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
-import org.bukkit.generator.BiomeProvider;
 import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
-import org.bukkit.generator.WorldInfo;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 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> {
-    private static final Logger LOGGER =  LogManager.getLogger("PlotSquared/" + BukkitPlotGenerator.class.getSimpleName());
 
     @SuppressWarnings("unused")
     public final boolean PAPER_ASYNC_SAFE = true;
@@ -64,15 +59,9 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
     private final ChunkGenerator platformGenerator;
     private final boolean full;
     private final String levelName;
-    private final boolean useNewGenerationMethods;
-    private final BiomeProvider biomeProvider;
     private List<BlockPopulator> populators;
     private boolean loaded = false;
 
-    private PlotArea lastPlotArea;
-    private int lastChunkX = Integer.MIN_VALUE;
-    private int lastChunkZ = Integer.MIN_VALUE;
-
     public BukkitPlotGenerator(
             final @NonNull String name,
             final @NonNull IndependentPlotGenerator generator,
@@ -83,30 +72,20 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
         this.plotGenerator = generator;
         this.platformGenerator = this;
         this.populators = new ArrayList<>();
-        int minecraftMinorVersion = PlotSquared.platform().serverVersion()[1];
+        this.populators.add(new BlockStatePopulator(this.plotGenerator, this.plotAreaManager));
-        if (minecraftMinorVersion >= 17) {
-            this.populators.add(new BlockStatePopulator(this.plotGenerator));
-        } else {
-            this.populators.add(new LegacyBlockStatePopulator(this.plotGenerator));
-        }
         this.full = true;
-        this.useNewGenerationMethods = PlotSquared.platform().serverVersion()[1] >= 19;
-        this.biomeProvider = new BukkitPlotBiomeProvider();
     }
 
     public BukkitPlotGenerator(final String world, final ChunkGenerator cg, final @NonNull PlotAreaManager plotAreaManager) {
         if (cg instanceof BukkitPlotGenerator) {
-            throw new IllegalArgumentException("ChunkGenerator: " + cg
+            throw new IllegalArgumentException("ChunkGenerator: " + cg.getClass().getName()
-                    .getClass()
+                    + " is already a BukkitPlotGenerator!");
-                    .getName() + " is already a BukkitPlotGenerator!");
         }
         this.plotAreaManager = plotAreaManager;
         this.levelName = world;
         this.full = false;
         this.platformGenerator = cg;
         this.plotGenerator = new DelegatePlotGenerator(cg, world);
-        this.useNewGenerationMethods = PlotSquared.platform().serverVersion()[1] >= 19;
-        this.biomeProvider = null;
     }
 
     @Override
@@ -132,9 +111,32 @@ 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) {
-            LOGGER.error("Error attempting to load world into PlotSquared.", e);
+            e.printStackTrace();
         }
         ArrayList<BlockPopulator> toAdd = new ArrayList<>();
         List<BlockPopulator> existing = world.getPopulators();
@@ -151,156 +153,20 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
         return toAdd;
     }
 
-    // Extracted to synchronized method for thread-safety, preventing multiple internal world load calls
-    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") // Kept for compatibility with <=1.17.1
-    private void setSpawnLimits(@NonNull World world, int limit) {
-        world.setAmbientSpawnLimit(limit);
-        world.setAnimalSpawnLimit(limit);
-        world.setMonsterSpawnLimit(limit);
-        world.setWaterAnimalSpawnLimit(limit);
-    }
-
     @Override
-    public void generateNoise(
-            @NotNull final WorldInfo worldInfo,
-            @NotNull final Random random,
-            final int chunkX,
-            final int chunkZ,
-            @NotNull final ChunkData chunkData
-    ) {
-        if (this.platformGenerator != this) {
-            this.platformGenerator.generateNoise(worldInfo, random, chunkX, chunkZ, chunkData);
-            return;
-        }
-        int minY = chunkData.getMinHeight();
-        int maxY = chunkData.getMaxHeight();
-        GenChunk result = new GenChunk(minY, maxY);
-        // Set the chunk location
-        result.setChunk(new ChunkWrapper(worldInfo.getName(), chunkX, chunkZ));
-        // Set the result data
-        result.setChunkData(chunkData);
-        result.result = null;
-
-        // Catch any exceptions (as exceptions usually thrown)
-        try {
-            generate(BlockVector2.at(chunkX, chunkZ), worldInfo.getName(), result, false);
-        } catch (Throwable e) {
-            LOGGER.error("Error attempting to generate chunk.", e);
-        }
-    }
-
-    @Override
-    public void generateSurface(
-            @NotNull final WorldInfo worldInfo,
-            @NotNull final Random random,
-            final int chunkX,
-            final int chunkZ,
-            @NotNull final ChunkData chunkData
-    ) {
-        if (platformGenerator != this) {
-            platformGenerator.generateSurface(worldInfo, random, chunkX, chunkZ, chunkData);
-        }
-    }
-
-    @Override
-    public void generateBedrock(
-            @NotNull final WorldInfo worldInfo,
-            @NotNull final Random random,
-            final int chunkX,
-            final int chunkZ,
-            @NotNull final ChunkData chunkData
-    ) {
-        if (platformGenerator != this) {
-            platformGenerator.generateBedrock(worldInfo, random, chunkX, chunkZ, chunkData);
-        }
-    }
-
-    @Override
-    public void generateCaves(
-            @NotNull final WorldInfo worldInfo,
-            @NotNull final Random random,
-            final int chunkX,
-            final int chunkZ,
-            @NotNull final ChunkData chunkData
-    ) {
-        if (platformGenerator != this) {
-            platformGenerator.generateCaves(worldInfo, random, chunkX, chunkZ, chunkData);
-        }
-    }
-
-    @Override
-    public @Nullable BiomeProvider getDefaultBiomeProvider(@NotNull final WorldInfo worldInfo) {
-        if (platformGenerator != this) {
-            return platformGenerator.getDefaultBiomeProvider(worldInfo);
-        }
-        return biomeProvider;
-    }
-
-    @Override
-    public int getBaseHeight(
-            @NotNull final WorldInfo worldInfo,
-            @NotNull final Random random,
-            final int x,
-            final int z,
-            @NotNull final HeightMap heightMap
-    ) {
-        PlotArea area = getPlotArea(worldInfo.getName(), x, z);
-        if (area instanceof ClassicPlotWorld cpw) {
-            // Default to plot height being the heighest point before decoration (i.e. roads, walls etc.)
-            return cpw.PLOT_HEIGHT;
-        }
-        return super.getBaseHeight(worldInfo, random, x, z, heightMap);
-    }
-
-    @SuppressWarnings("deprecation") // The entire method is deprecated, but kept for compatibility with <=1.16.2
-    @Override
-    @Deprecated(since = "TODO")
     public @NonNull ChunkData generateChunkData(
-            @NonNull World world, @NonNull Random random, int x, int z, @NonNull BiomeGrid biome
+            @NonNull World world, @NonNull Random random, int x, int z,
+            @NonNull BiomeGrid biome
     ) {
-        if (useNewGenerationMethods) {
-            if (this.platformGenerator != this) {
-                return this.platformGenerator.generateChunkData(world, random, x, z, biome);
-            } else {
-                // Return super as it will throw an exception caught by the server that will mean this method is no longer used.
-                return super.generateChunkData(world, random, x, z, biome);
-            }
-        }
 
-        int minY = BukkitWorld.getMinWorldHeight(world);
+        GenChunk result = new GenChunk();
-        int maxY = BukkitWorld.getMaxWorldHeight(world);
-        GenChunk result = new GenChunk(minY, maxY);
         if (this.getPlotGenerator() instanceof SingleWorldGenerator) {
             if (result.getChunkData() != null) {
                 for (int chunkX = 0; chunkX < 16; chunkX++) {
                     for (int chunkZ = 0; chunkZ < 16; chunkZ++) {
-                        for (int y = minY; y < maxY; y++) {
+                        for (int y = 0; y < world.getMaxHeight(); y++) {
                             biome.setBiome(chunkX, y, chunkZ, Biome.PLAINS);
+
                         }
                     }
                 }
@@ -320,32 +186,37 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
             if (this.platformGenerator != this) {
                 return this.platformGenerator.generateChunkData(world, random, x, z, biome);
             } else {
-                generate(BlockVector2.at(x, z), world.getName(), result, true);
+                generate(BlockVector2.at(x, z), world, result);
             }
         } catch (Throwable e) {
-            LOGGER.error("Error attempting to load world into PlotSquared.", e);
+            e.printStackTrace();
         }
         // Return the result data
         return result.getChunkData();
     }
 
-    private void generate(BlockVector2 loc, String world, ZeroedDelegateScopedQueueCoordinator result, boolean biomes) {
+    private void generate(BlockVector2 loc, World world, ScopedQueueCoordinator result) {
         // Load if improperly loaded
         if (!this.loaded) {
-            synchronized (this) {
+            String name = world.getName();
-                PlotSquared.get().loadWorld(world, this);
+            PlotSquared.get().loadWorld(name, this);
-            }
+            this.loaded = true;
         }
         // Process the chunk
         if (ChunkManager.preProcessChunk(loc, result)) {
             return;
         }
-        PlotArea area = getPlotArea(world, loc.getX(), loc.getZ());
+        PlotArea area = this.plotAreaManager.getPlotArea(world.getName(), null);
+        if (area == null && (area = this.plotAreaManager.getPlotArea(this.levelName, null)) == null) {
+            throw new IllegalStateException(
+                    "Cannot regenerate chunk that does not belong to a plot area." + " Location: " + loc
+                            + ", world: " + world);
+        }
         try {
-            this.plotGenerator.generateChunk(result, area, biomes);
+            this.plotGenerator.generateChunk(result, area);
         } catch (Throwable e) {
             // Recover from generator error
-            LOGGER.error("Error attempting to generate chunk.", e);
+            e.printStackTrace();
         }
         ChunkManager.postProcessChunk(loc, result);
     }
@@ -399,51 +270,4 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
         return this.levelName;
     }
 
-    private synchronized PlotArea getPlotArea(String name, int chunkX, int chunkZ) {
-        // Load if improperly loaded
-        if (!this.loaded) {
-            PlotSquared.get().loadWorld(name, this);
-            // Do not set loaded to true as we want to ensure spawn limits are set when "loading" is actually able to be
-            // completed properly.
-        }
-        if (lastPlotArea != null && name.equals(this.levelName) && chunkX == lastChunkX && chunkZ == lastChunkZ) {
-            return lastPlotArea;
-        }
-        PlotArea area = UncheckedWorldLocation.at(name, chunkX << 4, 0, chunkZ << 4).getPlotArea();
-        if (area == null) {
-            throw new IllegalStateException(String.format("Cannot generate chunk that does not belong to a plot area. World: %s",
-                    name
-            ));
-        }
-        this.lastChunkX = chunkX;
-        this.lastChunkZ = chunkZ;
-        return this.lastPlotArea = area;
-    }
-
-    /**
-     * Biome provider should never need to be accessed outside of this class.
-     */
-    private final class BukkitPlotBiomeProvider extends BiomeProvider {
-
-        private static final List<Biome> BIOMES;
-
-        static {
-            ArrayList<Biome> biomes = new ArrayList<>(List.of(Biome.values()));
-            biomes.remove(Biome.CUSTOM);
-            BIOMES = List.copyOf(biomes);
-        }
-
-        @Override
-        public @NotNull Biome getBiome(@NotNull final WorldInfo worldInfo, final int x, final int y, final int z) {
-            PlotArea area = getPlotArea(worldInfo.getName(), x >> 4, z >> 4);
-            return BukkitAdapter.adapt(plotGenerator.getBiome(area, x, y, z));
-        }
-
-        @Override
-        public @NotNull List<Biome> getBiomes(@NotNull final WorldInfo worldInfo) {
-            return BIOMES; // Allow all biomes
-        }
-
-    }
-
 }

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -24,10 +31,9 @@ import com.plotsquared.core.generator.IndependentPlotGenerator;
 import com.plotsquared.core.location.Location;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.PlotId;
-import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
+import com.plotsquared.core.queue.ScopedQueueCoordinator;
 import com.plotsquared.core.util.MathMan;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.world.biome.BiomeType;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.generator.BlockPopulator;
@@ -50,11 +56,6 @@ final class DelegatePlotGenerator extends IndependentPlotGenerator {
     public void initialize(PlotArea area) {
     }
 
-    @Override
-    public BiomeType getBiome(final PlotArea settings, final int x, final int y, final int z) {
-        return null;
-    }
-
     @Override
     public String getName() {
         return this.chunkGenerator.getClass().getName();
@@ -66,7 +67,7 @@ final class DelegatePlotGenerator extends IndependentPlotGenerator {
     }
 
     @Override
-    public void generateChunk(final ZeroedDelegateScopedQueueCoordinator result, PlotArea settings, boolean biomes) {
+    public void generateChunk(final ScopedQueueCoordinator result, PlotArea settings) {
         World world = BukkitUtil.getWorld(this.world);
         Location min = result.getMin();
         int chunkX = min.getX() >> 4;
@@ -79,8 +80,7 @@ final class DelegatePlotGenerator extends IndependentPlotGenerator {
                     result.setBiome(x, z, BukkitAdapter.adapt(biome));
                 }
 
-                //do not annotate with Override until we discontinue support for 1.4.4 (we no longer support 1.4.4)
+                //do not annotate with Override until we discontinue support for 1.4.4
-                @Override
                 public void setBiome(int x, int y, int z, @NonNull Biome biome) {
                     result.setBiome(x, z, BukkitAdapter.adapt(biome));
 

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

@@ -1,74 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.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.ZeroedDelegateScopedQueueCoordinator;
-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);
-        ZeroedDelegateScopedQueueCoordinator offsetChunkQueue = new ZeroedDelegateScopedQueueCoordinator(queue, min, max);
-        this.plotGenerator.populateChunk(offsetChunkQueue, area);
-        queue.enqueue();
-    }
-
-}

Bukkit/src/main/java/com/plotsquared/bukkit/inject/BackupModule.java

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

Bukkit/src/main/java/com/plotsquared/bukkit/inject/PermissionModule.java

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

Bukkit/src/main/java/com/plotsquared/bukkit/inject/WorldManagerModule.java

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -61,9 +68,7 @@ import com.plotsquared.core.util.task.TaskTime;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.world.block.BlockType;
-import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.Template;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
@@ -108,20 +113,11 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import java.util.UUID;
 
 @SuppressWarnings("unused")
 public class BlockEventListener implements Listener {
 
-    private static final Set<Material> PISTONS = Set.of(
-            Material.PISTON,
-            Material.STICKY_PISTON
-    );
-    private static final Set<Material> PHYSICS_BLOCKS = Set.of(
-            Material.TURTLE_EGG,
-            Material.TURTLE_SPAWN_EGG
-    );
     private final PlotAreaManager plotAreaManager;
     private final WorldEdit worldEdit;
 
@@ -227,33 +223,50 @@ public class BlockEventListener implements Listener {
             plot.debug("Prevented block physics and resent block change because disable-physics = true");
             return;
         }
-        if (event.getChangedType() == Material.COMPARATOR) {
+        switch (event.getChangedType()) {
+            case COMPARATOR: {
                 if (!plot.getFlag(RedstoneFlag.class)) {
                     event.setCancelled(true);
                     plot.debug("Prevented comparator update because redstone = false");
                 }
                 return;
             }
-        if (PHYSICS_BLOCKS.contains(event.getChangedType())) {
+            case ANVIL:
+            case DRAGON_EGG:
+            case GRAVEL:
+            case SAND:
+            case TURTLE_EGG:
+            case TURTLE_HELMET:
+            case TURTLE_SPAWN_EGG: {
                 if (plot.getFlag(DisablePhysicsFlag.class)) {
                     event.setCancelled(true);
                     plot.debug("Prevented block physics because disable-physics = true");
                 }
                 return;
             }
+            default:
                 if (Settings.Redstone.DETECT_INVALID_EDGE_PISTONS) {
-            if (PISTONS.contains(block.getType())) {
+                    switch (block.getType()) {
+                        case PISTON, STICKY_PISTON -> {
                             org.bukkit.block.data.Directional piston = (org.bukkit.block.data.Directional) block.getBlockData();
-                final BlockFace facing = piston.getFacing();
+                            switch (piston.getFacing()) {
-                location = location.add(facing.getModX(), facing.getModY(), facing.getModZ());
+                                case EAST -> location = location.add(1, 0, 0);
+                                case SOUTH -> location = location.add(-1, 0, 0);
+                                case WEST -> location = location.add(0, 0, 1);
+                                case NORTH -> location = location.add(0, 0, -1);
+                            }
                             Plot newPlot = area.getOwnedPlotAbs(location);
                             if (!plot.equals(newPlot)) {
                                 event.setCancelled(true);
                                 plot.debug("Prevented piston update because of invalid edge piston detection");
+                                return;
                             }
                         }
                     }
                 }
+                break;
+        }
+    }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void blockCreate(BlockPlaceEvent event) {
@@ -272,20 +285,15 @@ public class BlockEventListener implements Listener {
                 event.setCancelled(true);
                 pp.sendMessage(
                         TranslatableCaption.of("height.height_limit"),
-                        TagResolver.builder()
+                        Template.of("minHeight", String.valueOf(area.getMinBuildHeight())),
-                                .tag("minheight", Tag.inserting(Component.text(area.getMinBuildHeight())))
+                        Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight()))
-                                .tag("maxheight", Tag.inserting(Component.text(area.getMaxBuildHeight())))
-                                .build()
                 );
             }
             if (!plot.hasOwner()) {
                 if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
                     pp.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
-                                    "node",
-                                    Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
-                            )
                     );
                     event.setCancelled(true);
                     return;
@@ -302,10 +310,7 @@ public class BlockEventListener implements Listener {
                 if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
                     pp.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
-                                    "node",
-                                    Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
-                            )
                     );
                     event.setCancelled(true);
                     plot.debug(player.getName() + " could not place " + event.getBlock().getType()
@@ -332,10 +337,7 @@ public class BlockEventListener implements Listener {
         } else if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
             pp.sendMessage(
                     TranslatableCaption.of("permission.no_permission_event"),
-                    TagResolver.resolver(
+                    Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
-                            "node",
-                            Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD)
-                    )
             );
             event.setCancelled(true);
         }
@@ -352,16 +354,12 @@ public class BlockEventListener implements Listener {
         Plot plot = area.getPlot(location);
         if (plot != null) {
             BukkitPlayer plotPlayer = BukkitUtil.adapt(player);
-            // == rather than <= as we only care about the "ground level" not being destroyed
+            if (event.getBlock().getY() == 0) {
-            if (event.getBlock().getY() == area.getMinGenHeight()) {
                 if (!Permissions
                         .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) {
                     plotPlayer.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL))
-                                    "node",
-                                    Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)
-                            )
                     );
                     event.setCancelled(true);
                     return;
@@ -372,10 +370,8 @@ public class BlockEventListener implements Listener {
                 event.setCancelled(true);
                 plotPlayer.sendMessage(
                         TranslatableCaption.of("height.height_limit"),
-                        TagResolver.builder()
+                        Template.of("minHeight", String.valueOf(area.getMinBuildHeight())),
-                                .tag("minheight", Tag.inserting(Component.text(area.getMinBuildHeight())))
+                        Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight()))
-                                .tag("maxheight", Tag.inserting(Component.text(area.getMaxBuildHeight())))
-                                .build()
                 );
             }
             if (!plot.hasOwner()) {
@@ -400,10 +396,7 @@ public class BlockEventListener implements Listener {
                 }
                 plotPlayer.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
-                        TagResolver.resolver(
+                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER))
-                                "node",
-                                Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_OTHER)
-                        )
                 );
                 event.setCancelled(true);
             } else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
@@ -429,10 +422,7 @@ public class BlockEventListener implements Listener {
         }
         pp.sendMessage(
                 TranslatableCaption.of("permission.no_permission_event"),
-                TagResolver.resolver(
+                Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_ROAD))
-                        "node",
-                        Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_ROAD)
-                )
         );
         event.setCancelled(true);
     }
@@ -560,18 +550,17 @@ public class BlockEventListener implements Listener {
         if (plot == null) {
             return;
         }
-        if (location.getY() >= area.getMaxBuildHeight() || location.getY() < area.getMinBuildHeight()) {
+        switch (event.getNewState().getType()) {
-            event.setCancelled(true);
+            case SNOW:
-            return;
+            case SNOW_BLOCK:
-        }
-        if (org.bukkit.Tag.SNOW.isTagged(event.getNewState().getType())) {
                 if (!plot.getFlag(SnowFormFlag.class)) {
                     plot.debug("Snow could not form because snow-form = false");
                     event.setCancelled(true);
                 }
                 return;
-        }
+            case ICE:
-        if (org.bukkit.Tag.ICE.isTagged(event.getNewState().getType())) {
+            case FROSTED_ICE:
+            case PACKED_ICE:
                 if (!plot.getFlag(IceFormFlag.class)) {
                     plot.debug("Ice could not form because ice-form = false");
                     event.setCancelled(true);
@@ -596,12 +585,18 @@ public class BlockEventListener implements Listener {
             return;
         }
         Class<? extends BooleanFlag<?>> flag;
-        if (org.bukkit.Tag.SNOW.isTagged(event.getNewState().getType())) {
+        switch (event.getNewState().getType()) {
+            case SNOW:
+            case SNOW_BLOCK:
                 flag = SnowFormFlag.class;
-        } else if (org.bukkit.Tag.ICE.isTagged(event.getNewState().getType())) {
+                break;
+            case ICE:
+            case FROSTED_ICE:
+            case PACKED_ICE:
                 flag = IceFormFlag.class;
-        } else {
+                break;
-            return;
+            default:
+                return; // other blocks are ignored by this event
         }
         boolean allowed = plot.getFlag(flag);
         Entity entity = event.getEntity();
@@ -654,8 +649,7 @@ public class BlockEventListener implements Listener {
                     event.getBlock().breakNaturally();
                 }
             }
-            // == rather than <= as we only care about the "ground level" not being destroyed
+            if (location.getY() == 0) {
-            if (location.getY() == area.getMinGenHeight()) {
                 event.setCancelled(true);
                 return;
             }
@@ -705,98 +699,111 @@ public class BlockEventListener implements Listener {
             event.setCancelled(true);
             return;
         }
-        Material blockType = block.getType();
+        switch (block.getType()) {
-        if (org.bukkit.Tag.ICE.isTagged(blockType)) {
+            case ICE:
                 if (!plot.getFlag(IceMeltFlag.class)) {
                     plot.debug("Ice could not melt because ice-melt = false");
                     event.setCancelled(true);
                 }
-            return;
+                break;
-        }
+            case SNOW:
-        if (org.bukkit.Tag.SNOW.isTagged(blockType)) {
                 if (!plot.getFlag(SnowMeltFlag.class)) {
                     plot.debug("Snow could not melt because snow-melt = false");
                     event.setCancelled(true);
                 }
-            return;
+                break;
-        }
+            case FARMLAND:
-        if (blockType == Material.FARMLAND) {
                 if (!plot.getFlag(SoilDryFlag.class)) {
                     plot.debug("Soil could not dry because soil-dry = false");
                     event.setCancelled(true);
                 }
-            return;
+                break;
-        }
+            case TUBE_CORAL_BLOCK:
-        if (org.bukkit.Tag.CORAL_BLOCKS.isTagged(blockType) || org.bukkit.Tag.CORALS.isTagged(blockType)) {
+            case BRAIN_CORAL_BLOCK:
+            case BUBBLE_CORAL_BLOCK:
+            case FIRE_CORAL_BLOCK:
+            case HORN_CORAL_BLOCK:
+            case TUBE_CORAL:
+            case BRAIN_CORAL:
+            case BUBBLE_CORAL:
+            case FIRE_CORAL:
+            case HORN_CORAL:
+            case TUBE_CORAL_FAN:
+            case BRAIN_CORAL_FAN:
+            case BUBBLE_CORAL_FAN:
+            case FIRE_CORAL_FAN:
+            case HORN_CORAL_FAN:
+            case BRAIN_CORAL_WALL_FAN:
+            case BUBBLE_CORAL_WALL_FAN:
+            case FIRE_CORAL_WALL_FAN:
+            case HORN_CORAL_WALL_FAN:
+            case TUBE_CORAL_WALL_FAN:
                 if (!plot.getFlag(CoralDryFlag.class)) {
                     plot.debug("Coral could not dry because coral-dry = false");
                     event.setCancelled(true);
                 }
+                break;
         }
     }
 
     @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 Location fLocation = BukkitUtil.adapt(from.getLocation());
-        final PlotArea fromArea = fromLocation.getPlotArea();
+        final PlotArea fromArea = fLocation.getPlotArea();
         if (fromArea != null) {
-            final Plot fromPlot = fromArea.getOwnedPlot(fromLocation);
+            final Plot plot = fromArea.getOwnedPlot(fLocation);
-            if (fromPlot != null && fromPlot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.DISABLED && event
+            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();
+        Block to = event.getToBlock();
-        Location toLocation = BukkitUtil.adapt(toBlock.getLocation());
+        Location tLocation = BukkitUtil.adapt(to.getLocation());
-        PlotArea toArea = toLocation.getPlotArea();
+        PlotArea area = tLocation.getPlotArea();
-        if (toArea == null) {
+        if (area == null) {
-            if (fromBlock.getType() == Material.DRAGON_EGG && fromArea != null) {
+            if (from.getType() == Material.DRAGON_EGG && fromArea != null) {
                 event.setCancelled(true);
             }
             return;
         }
-        if (toLocation.getY() >= toArea.getMaxBuildHeight() || toLocation.getY() < toArea.getMinBuildHeight()) {
+        Plot plot = area.getOwnedPlot(tLocation);
-            event.setCancelled(true);
-            return;
-        }
-        Plot toPlot = toArea.getOwnedPlot(toLocation);
 
-        if (fromBlock.getType() == Material.DRAGON_EGG && fromArea != null) {
+        if (from.getType() == Material.DRAGON_EGG && fromArea != null) {
-            final Plot fromPlot = fromArea.getOwnedPlot(fromLocation);
+            final Plot fromPlot = fromArea.getOwnedPlot(fLocation);
 
-            if (fromPlot != null || toPlot != null) {
+            if (fromPlot != null || plot != null) {
-                if ((fromPlot == null || !fromPlot.equals(toPlot)) && (toPlot == null || !toPlot.equals(fromPlot))) {
+                if ((fromPlot == null || !fromPlot.equals(plot)) && (plot == null || !plot.equals(fromPlot))) {
                     event.setCancelled(true);
                     return;
                 }
             }
         }
 
-        if (toPlot != null) {
+        if (plot != null) {
-            if (!toArea.contains(fromLocation.getX(), fromLocation.getZ()) || !Objects.equals(toPlot, toArea.getOwnedPlot(fromLocation))) {
+            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)) {
+            if (plot.getFlag(DisablePhysicsFlag.class)) {
-                toPlot.debug(event.getBlock().getType() + " could not update because disable-physics = true");
+                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()) {
+            if (plot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.DISABLED && event.getBlock().isLiquid()) {
-                toPlot.debug("Liquid could not flow because liquid-flow = disabled");
+                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();
@@ -948,12 +955,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",
+            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" -> {
-                    "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" -> {
                 if (event.getBlock().getType() == Material.DROPPER) {
                     return;
                 }
@@ -1095,10 +1097,7 @@ public class BlockEventListener implements Listener {
                 if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
                     pp.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
-                                    "node",
-                                    Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD)
-                            )
                     );
                     event.setCancelled(true);
                 }
@@ -1106,10 +1105,7 @@ public class BlockEventListener implements Listener {
                 if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
                     pp.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
-                                    "node",
-                                    Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
-                            )
                     );
                     event.setCancelled(true);
                 }
@@ -1117,10 +1113,7 @@ public class BlockEventListener implements Listener {
                 if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
                     pp.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
-                                    "node",
-                                    Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
-                            )
                     );
                     event.setCancelled(true);
                 }
@@ -1244,7 +1237,7 @@ public class BlockEventListener implements Listener {
             ) && !(Objects.equals(currentLocation.getPlot(), plot))) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
-                        TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD))
+                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
                 );
                 event.setCancelled(true);
                 break;
@@ -1255,10 +1248,8 @@ public class BlockEventListener implements Listener {
             if (currentLocation.getY() >= area.getMaxBuildHeight() || currentLocation.getY() < area.getMinBuildHeight()) {
                 pp.sendMessage(
                         TranslatableCaption.of("height.height_limit"),
-                        TagResolver.builder()
+                        Template.of("minHeight", String.valueOf(area.getMinBuildHeight())),
-                                .tag("minheight", Tag.inserting(Component.text(area.getMinBuildHeight())))
+                        Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight()))
-                                .tag("maxheight", Tag.inserting(Component.text(area.getMaxBuildHeight())))
-                                .build()
                 );
                 event.setCancelled(true);
                 break;

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -26,7 +33,6 @@ import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag;
 import com.plotsquared.core.plot.flag.implementations.MiscInteractFlag;
-import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Item;
@@ -40,31 +46,11 @@ import org.bukkit.event.block.BlockReceiveGameEvent;
 
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import java.util.UUID;
 
 @SuppressWarnings("unused")
 public class BlockEventListener117 implements Listener {
 
-    private static final Set<Material> COPPER_OXIDIZING = Set.of(
-            Material.COPPER_BLOCK,
-            Material.EXPOSED_COPPER,
-            Material.WEATHERED_COPPER,
-            Material.OXIDIZED_COPPER,
-            Material.CUT_COPPER,
-            Material.EXPOSED_CUT_COPPER,
-            Material.WEATHERED_CUT_COPPER,
-            Material.OXIDIZED_CUT_COPPER,
-            Material.CUT_COPPER_STAIRS,
-            Material.EXPOSED_CUT_COPPER_STAIRS,
-            Material.WEATHERED_CUT_COPPER_STAIRS,
-            Material.OXIDIZED_CUT_COPPER_STAIRS,
-            Material.CUT_COPPER_SLAB,
-            Material.EXPOSED_CUT_COPPER_SLAB,
-            Material.WEATHERED_CUT_COPPER_SLAB,
-            Material.OXIDIZED_CUT_COPPER_SLAB
-    );
-
     @Inject
     public BlockEventListener117() {
     }
@@ -169,7 +155,23 @@ public class BlockEventListener117 implements Listener {
         if (plot == null) {
             return;
         }
-        if (COPPER_OXIDIZING.contains(event.getNewState().getType())) {
+        switch (event.getNewState().getType()) {
+            case COPPER_BLOCK:
+            case EXPOSED_COPPER:
+            case WEATHERED_COPPER:
+            case OXIDIZED_COPPER:
+            case CUT_COPPER:
+            case EXPOSED_CUT_COPPER:
+            case WEATHERED_CUT_COPPER:
+            case OXIDIZED_CUT_COPPER:
+            case CUT_COPPER_STAIRS:
+            case EXPOSED_CUT_COPPER_STAIRS:
+            case WEATHERED_CUT_COPPER_STAIRS:
+            case OXIDIZED_CUT_COPPER_STAIRS:
+            case CUT_COPPER_SLAB:
+            case EXPOSED_CUT_COPPER_SLAB:
+            case WEATHERED_CUT_COPPER_SLAB:
+            case OXIDIZED_CUT_COPPER_SLAB:
                 if (!plot.getFlag(CopperOxideFlag.class)) {
                     plot.debug("Copper could not oxide because copper-oxide = false");
                     event.setCancelled(true);

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -161,7 +168,6 @@ public class EntityEventListener implements Listener {
             case "RAID":
             case "SHEARED":
             case "SILVERFISH_BLOCK":
-            case "ENDER_PEARL":
             case "TRAP":
             case "VILLAGE_DEFENSE":
             case "VILLAGE_INVASION":
@@ -201,7 +207,7 @@ public class EntityEventListener implements Listener {
             }
             return;
         }
-        if (BukkitEntityUtil.checkEntity(entity, plot.getBasePlot(false))) {
+        if (BukkitEntityUtil.checkEntity(entity, plot)) {
             event.setCancelled(true);
         }
     }

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -124,16 +131,16 @@ public class EntitySpawnListener implements Listener {
             return;
         }
         Plot plot = location.getOwnedPlotAbs();
-        EntityType type = entity.getType();
         if (plot == null) {
+            EntityType type = entity.getType();
             if (!area.isMobSpawning()) {
-                if (type == EntityType.PLAYER) {
+                switch (type) {
-                    return;
+                    case DROPPED_ITEM:
-                }
-                if (type == EntityType.DROPPED_ITEM) {
                         if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
                             event.setCancelled(true);
+                            return;
                         }
+                    case PLAYER:
                         return;
                 }
                 if (type.isAlive()) {
@@ -148,13 +155,12 @@ public class EntitySpawnListener implements Listener {
         if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
             event.setCancelled(true);
         }
-        if (type == EntityType.ENDER_CRYSTAL) {
+        switch (entity.getType()) {
+            case ENDER_CRYSTAL:
                 if (BukkitEntityUtil.checkEntity(entity, plot)) {
                     event.setCancelled(true);
                 }
-            return;
+            case SHULKER:
-        }
-        if (type == EntityType.SHULKER) {
                 if (!entity.hasMetadata("shulkerPlot")) {
                     entity.setMetadata("shulkerPlot", new FixedMetadataValue((Plugin) PlotSquared.platform(), plot.getId()));
                 }

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -37,12 +44,9 @@ import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
-import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.Permissions;
-import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.Template;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.Chunk;
 import org.bukkit.block.Block;
 import org.bukkit.block.TileState;
@@ -191,7 +195,6 @@ public class PaperListener implements Listener {
             case "RAID":
             case "SHEARED":
             case "SILVERFISH_BLOCK":
-            case "ENDER_PEARL":
             case "TRAP":
             case "VILLAGE_DEFENSE":
             case "VILLAGE_INVASION":
@@ -232,14 +235,14 @@ public class PaperListener implements Listener {
         if (plot == null) {
             EntityType type = event.getType();
             if (!area.isMobSpawning()) {
-                if (type == EntityType.PLAYER) {
+                switch (type) {
-                    return;
+                    case DROPPED_ITEM:
-                }
-                if (type == EntityType.DROPPED_ITEM) {
                         if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
                             event.setShouldAbortSpawn(true);
                             event.setCancelled(true);
+                            return;
                         }
+                    case PLAYER:
                         return;
                 }
                 if (type.isAlive()) {
@@ -300,7 +303,7 @@ public class PaperListener implements Listener {
             final PlotPlayer<?> plotPlayer = BukkitUtil.adapt(event.getPlayer());
             plotPlayer.sendMessage(
                     TranslatableCaption.of("errors.tile_entity_cap_reached"),
-                    TagResolver.resolver("amount", Tag.inserting(Component.text(Settings.Chunk_Processor.MAX_TILES)))
+                    Template.of("amount", String.valueOf(Settings.Chunk_Processor.MAX_TILES))
             );
             event.setCancelled(true);
             event.setBuild(false);
@@ -334,10 +337,7 @@ public class PaperListener implements Listener {
             if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
-                        TagResolver.resolver(
+                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD))
-                                "node",
-                                Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)
-                        )
                 );
                 entity.remove();
                 event.setCancelled(true);
@@ -346,30 +346,22 @@ public class PaperListener implements Listener {
             if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
-                        TagResolver.resolver(
+                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED))
-                                "node",
-                                Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)
-                        )
                 );
                 entity.remove();
                 event.setCancelled(true);
             }
         } else if (!plot.isAdded(pp.getUUID())) {
-            if (!plot.getFlag(ProjectilesFlag.class)) {
             if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER))
-                                    "node",
-                                    Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)
-                            )
                 );
                 entity.remove();
                 event.setCancelled(true);
             }
         }
     }
-    }
 
     @EventHandler
     public void onAsyncTabCompletion(final AsyncTabCompleteEvent event) {

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -26,9 +33,7 @@ import com.plotsquared.core.location.Location;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.world.PlotAreaManager;
-import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.Template;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.block.Banner;
 import org.bukkit.block.Beacon;
 import org.bukkit.block.BlockState;
@@ -79,7 +84,7 @@ public class PaperListener113 extends PaperListener {
             final PlotPlayer<?> plotPlayer = BukkitUtil.adapt(event.getPlayer());
             plotPlayer.sendMessage(
                     TranslatableCaption.of("errors.tile_entity_cap_reached"),
-                    TagResolver.resolver("amount", Tag.inserting(Component.text(Settings.Chunk_Processor.MAX_TILES)))
+                    Template.of("amount", String.valueOf(Settings.Chunk_Processor.MAX_TILES))
             );
             event.setCancelled(true);
             event.setBuild(false);

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -69,6 +76,7 @@ import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.Permissions;
 import com.plotsquared.core.util.PremiumVerification;
+import com.plotsquared.core.util.RegExUtil;
 import com.plotsquared.core.util.entity.EntityCategories;
 import com.plotsquared.core.util.task.TaskManager;
 import com.plotsquared.core.util.task.TaskTime;
@@ -77,11 +85,9 @@ import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.world.block.BlockType;
 import io.papermc.lib.PaperLib;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.minimessage.Template;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import net.kyori.adventure.text.minimessage.tag.standard.StandardTags;
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.FluidCollisionMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -147,11 +153,13 @@ import org.bukkit.util.Vector;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import java.util.UUID;
+import java.util.regex.Pattern;
 
 /**
  * Player Events involving plots.
@@ -159,20 +167,6 @@ import java.util.UUID;
 @SuppressWarnings("unused")
 public class PlayerEventListener extends PlotListener implements Listener {
 
-    private static final Set<Material> MINECARTS = Set.of(
-            Material.MINECART,
-            Material.TNT_MINECART,
-            Material.CHEST_MINECART,
-            Material.COMMAND_BLOCK_MINECART,
-            Material.FURNACE_MINECART,
-            Material.HOPPER_MINECART
-    );
-    private static final Set<Material> BOOKS = Set.of(
-            Material.BOOK,
-            Material.KNOWLEDGE_BOOK,
-            Material.WRITABLE_BOOK,
-            Material.WRITTEN_BOOK
-    );
     private final EventDispatcher eventDispatcher;
     private final WorldEdit worldEdit;
     private final PlotAreaManager plotAreaManager;
@@ -229,9 +223,10 @@ public class PlayerEventListener extends PlotListener implements Listener {
         }
     }
 
+    @SuppressWarnings("StringSplitter")
     @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
     public void playerCommand(PlayerCommandPreprocessEvent event) {
-        String msg = event.getMessage().replace("/", "").toLowerCase(Locale.ROOT).trim();
+        String msg = event.getMessage().toLowerCase().replaceAll("/", "").trim();
         if (msg.isEmpty()) {
             return;
         }
@@ -245,9 +240,11 @@ public class PlayerEventListener extends PlotListener implements Listener {
         String[] parts = msg.split(" ");
         Plot plot = plotPlayer.getCurrentPlot();
         // Check WorldEdit
-        switch (parts[0]) {
+        switch (parts[0].toLowerCase()) {
             case "up":
+            case "/up":
             case "worldedit:up":
+            case "worldedit:/up":
                 if (plot == null || (!plot.isAdded(plotPlayer.getUUID()) && !Permissions
                         .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_OTHER, true))) {
                     event.setCancelled(true);
@@ -261,40 +258,15 @@ public class PlayerEventListener extends PlotListener implements Listener {
         List<String> blockedCommands = plot != null ?
                 plot.getFlag(BlockedCmdsFlag.class) :
                 area.getFlag(BlockedCmdsFlag.class);
-        if (blockedCommands.isEmpty()) {
+        if (!blockedCommands.isEmpty() && !Permissions
-            return;
+                .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
-        }
-        if (Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
-            return;
-        }
-        // When using namespaced commands, we're not interested in the namespace
             String part = parts[0];
-        if (part.contains(":")) {
+            if (parts[0].contains(":")) {
-            String[] namespaced = part.split(":");
+                part = parts[0].split(":")[1];
-            part = namespaced[1];
+                msg = msg.replace(parts[0].split(":")[0] + ':', "");
-            msg = msg.substring(namespaced[0].length() + 1);
             }
-        msg = replaceAliases(msg, part);
-        for (String blocked : blockedCommands) {
-            if (blocked.equalsIgnoreCase(msg)) {
-                String perm;
-                if (plot != null && plot.isAdded(plotPlayer.getUUID())) {
-                    perm = "plots.admin.command.blocked-cmds.shared";
-                } else {
-                    perm = "plots.admin.command.blocked-cmds.road";
-                }
-                if (!Permissions.hasPermission(plotPlayer, perm)) {
-                    plotPlayer.sendMessage(TranslatableCaption.of("blockedcmds.command_blocked"));
-                    event.setCancelled(true);
-                }
-                return;
-            }
-        }
-    }
-
-    private String replaceAliases(String msg, String part) {
             String s1 = part;
-        Set<String> aliases = new HashSet<>();
+            List<String> aliases = new ArrayList<>();
             for (HelpTopic cmdLabel : Bukkit.getServer().getHelpMap().getHelpTopics()) {
                 if (part.equals(cmdLabel.getName())) {
                     break;
@@ -303,8 +275,8 @@ public class PlayerEventListener extends PlotListener implements Listener {
                 if (aliases.contains(label)) {
                     continue;
                 }
-            PluginCommand p = Bukkit.getPluginCommand(label);
+                PluginCommand p;
-            if (p != null) {
+                if ((p = Bukkit.getPluginCommand(label)) != null) {
                     for (String a : p.getAliases()) {
                         if (aliases.contains(a)) {
                             continue;
@@ -321,7 +293,28 @@ public class PlayerEventListener extends PlotListener implements Listener {
             if (!s1.equals(part)) {
                 msg = msg.replace(s1, part);
             }
-        return msg;
+            for (String s : blockedCommands) {
+                Pattern pattern;
+                if (!RegExUtil.compiledPatterns.containsKey(s)) {
+                    RegExUtil.compiledPatterns.put(s, pattern = Pattern.compile(s));
+                } else {
+                    pattern = RegExUtil.compiledPatterns.get(s);
+                }
+                if (pattern.matcher(msg).matches()) {
+                    String perm;
+                    if (plot != null && plot.isAdded(plotPlayer.getUUID())) {
+                        perm = "plots.admin.command.blocked-cmds.shared";
+                    } else {
+                        perm = "plots.admin.command.blocked-cmds.road";
+                    }
+                    if (!Permissions.hasPermission(plotPlayer, perm)) {
+                        plotPlayer.sendMessage(TranslatableCaption.of("blockedcmds.command_blocked"));
+                        event.setCancelled(true);
+                    }
+                    return;
+                }
+            }
+        }
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@@ -370,15 +363,11 @@ public class PlayerEventListener extends PlotListener implements Listener {
                 && PremiumVerification.isPremium() && UpdateUtility.hasUpdate) {
             Caption boundary = TranslatableCaption.of("update.update_boundary");
             Caption updateNotification = TranslatableCaption.of("update.update_notification");
+            Template internalVersion = Template.of("p2version", UpdateUtility.internalVersion.versionString());
+            Template spigotVersion = Template.of("spigotversion", UpdateUtility.spigotVersion);
+            Template downloadUrl = Template.of("downloadurl", "https://www.spigotmc.org/resources/77506/updates");
             pp.sendMessage(boundary);
-            pp.sendMessage(
+            pp.sendMessage(updateNotification, internalVersion, spigotVersion, downloadUrl);
-                    updateNotification,
-                    TagResolver.builder()
-                            .tag("p2version", Tag.inserting(Component.text(UpdateUtility.internalVersion.versionString())))
-                            .tag("spigotversion", Tag.inserting(Component.text(UpdateUtility.spigotVersion)))
-                            .tag("downloadurl", Tag.preProcessParsed("https://www.spigotmc.org/resources/77506/updates"))
-                            .build()
-            );
             pp.sendMessage(boundary);
         }
     }
@@ -430,7 +419,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
                             .equals(BukkitUtil.adaptComplete(to)))) {
                         pp.sendMessage(
                                 TranslatableCaption.of("deny.no_enter"),
-                                TagResolver.resolver("plot", Tag.inserting(Component.text(plot.toString())))
+                                Template.of("plot", plot.toString())
                         );
                         event.setCancelled(true);
                     }
@@ -546,10 +535,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
                     if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
                         pp.sendMessage(
                                 TranslatableCaption.of("permission.no_permission_event"),
-                                TagResolver.resolver(
+                                Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_EXIT_DENIED))
-                                        "node",
-                                        Tag.inserting(Permission.PERMISSION_ADMIN_EXIT_DENIED)
-                                )
                         );
                         this.tmpTeleport = false;
                         if (lastPlot.equals(BukkitUtil.adapt(from).getPlot())) {
@@ -567,7 +553,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
             } else if (!plotEntry(pp, now) && this.tmpTeleport) {
                 pp.sendMessage(
                         TranslatableCaption.of("deny.no_enter"),
-                        TagResolver.resolver("plot", Tag.inserting(Component.text(now.toString())))
+                        Template.of("plot", now.toString())
                 );
                 this.tmpTeleport = false;
                 to.setX(from.getBlockX());
@@ -639,10 +625,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
                     if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
                         pp.sendMessage(
                                 TranslatableCaption.of("permission.no_permission_event"),
-                                TagResolver.resolver(
+                                Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_EXIT_DENIED))
-                                        "node",
-                                        Tag.inserting(Permission.PERMISSION_ADMIN_EXIT_DENIED)
-                                )
                         );
                         this.tmpTeleport = false;
                         if (lastPlot.equals(BukkitUtil.adapt(from).getPlot())) {
@@ -660,7 +643,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
             } else if (!plotEntry(pp, plot) && this.tmpTeleport) {
                 pp.sendMessage(
                         TranslatableCaption.of("deny.no_enter"),
-                        TagResolver.resolver("plot", Tag.inserting(Component.text(plot.toString())))
+                        Template.of("plot", plot.toString())
                 );
                 this.tmpTeleport = false;
                 player.teleport(from);
@@ -745,34 +728,46 @@ public class PlayerEventListener extends PlotListener implements Listener {
         PlotId id = plot.getId();
         String worldName = plot.getWorldName();
         Caption msg = TranslatableCaption.of("chat.plot_chat_format");
-        TagResolver.Builder builder = TagResolver.builder();
+        Template msgTemplate;
-        builder.tag("world", Tag.inserting(Component.text(worldName)));
+        Template worldNameTemplate = Template.of("world", worldName);
-        builder.tag("plot_id", Tag.inserting(Component.text(id.toString())));
+        Template plotTemplate = Template.of("plot_id", id.toString());
-        builder.tag("sender", Tag.inserting(Component.text(sender)));
+        Template senderTemplate = Template.of("sender", sender);
+        // If we do/don't want colour, we need to be careful about how to go about it, as players could attempt either <gold></gold> or &6 etc.
+        // In both cases, we want to use a Component Template to ensure that the player cannot use any placeholders in their message on purpose
+        //  or accidentally, as component templates are done at the end. We also need to deserialize from legacy color codes to a Component if
+        //  allowing colour.
         if (plotPlayer.hasPermission("plots.chat.color")) {
-            builder.tag("msg", Tag.inserting(MiniMessage.miniMessage().deserialize(
+            msgTemplate = Template
-                    message,
+                    .of(
-                    TagResolver.resolver(StandardTags.color(), StandardTags.gradient(),
+                            "msg",
-                            StandardTags.rainbow(), StandardTags.decorations()
+                            BukkitUtil.LEGACY_COMPONENT_SERIALIZER.deserialize(ChatColor.translateAlternateColorCodes(
-                    )
+                                    '&',
-            )));
+                                    message
+                            ))
+                    );
         } else {
-            builder.tag("msg", Tag.inserting(Component.text(message)));
+            msgTemplate = Template.of("msg", BukkitUtil.MINI_MESSAGE.deserialize(
+                    ChatColor.stripColor(BukkitUtil.LEGACY_COMPONENT_SERIALIZER.serialize(Component.text(message)))));
         }
         for (PlotPlayer<?> receiver : plotRecipients) {
-            receiver.sendMessage(msg, builder.build());
+            receiver.sendMessage(msg, worldNameTemplate, msgTemplate, plotTemplate, senderTemplate);
         }
         if (!spies.isEmpty()) {
             Caption spymsg = TranslatableCaption.of("chat.plot_chat_spy_format");
+            Template plotidTemplate = Template.of("plot_id", id.getX() + ";" + id.getY());
+            Template spysenderTemplate = Template.of("sender", sender);
+            Template spymessageTemplate = Template.of("msg", Component.text(message));
             for (PlotPlayer<?> player : spies) {
-                player.sendMessage(spymsg, builder.tag("message", Tag.inserting(Component.text(message))).build());
+                player.sendMessage(spymsg, worldNameTemplate, plotidTemplate, spysenderTemplate, spymessageTemplate);
             }
         }
         if (Settings.Chat.LOG_PLOTCHAT_TO_CONSOLE) {
             Caption spymsg = TranslatableCaption.of("chat.plot_chat_spy_format");
-            ConsolePlayer.getConsole().sendMessage(
+            Template plotidTemplate = Template.of("plot_id", id.getX() + ";" + id.getY());
-                    spymsg,
+            Template spysenderTemplate = Template.of("sender", sender);
-                    builder.tag("message", Tag.inserting(Component.text(message))).build()
+            Template spymessageTemplate = Template.of("msg", Component.text(message));
+            ConsolePlayer.getConsole().sendMessage(spymsg, worldNameTemplate, plotidTemplate, spysenderTemplate,
+                    spymessageTemplate
             );
         }
     }
@@ -842,10 +837,10 @@ public class PlayerEventListener extends PlotListener implements Listener {
         if ((slot > 8) || !event.getEventName().equals("InventoryCreativeEvent")) {
             return;
         }
-        ItemStack oldItem = inv.getItemInHand();
+        ItemStack current = inv.getItemInHand();
-        ItemMeta oldMeta = oldItem.getItemMeta();
         ItemStack newItem = event.getCursor();
         ItemMeta newMeta = newItem.getItemMeta();
+        ItemMeta oldMeta = newItem.getItemMeta();
 
         if (event.getClick() == ClickType.CREATIVE) {
             final Plot plot = pp.getCurrentPlot();
@@ -885,25 +880,33 @@ public class PlayerEventListener extends PlotListener implements Listener {
                 oldLore = lore.toString();
             }
         }
-        Material itemType = newItem.getType();
+        if (!"[(+NBT)]".equals(newLore) || (current.equals(newItem) && newLore.equals(oldLore))) {
-        if (!"[(+NBT)]".equals(newLore) || (oldItem.equals(newItem) && newLore.equals(oldLore))) {
+            switch (newItem.getType()) {
-            if (newMeta == null || (itemType != Material.LEGACY_BANNER && itemType != Material.PLAYER_HEAD)) {
+                case LEGACY_BANNER:
+                case PLAYER_HEAD:
+                    if (newMeta != null) {
+                        break;
+                    }
+                default:
                     return;
             }
         }
         Block block = player.getTargetBlock(null, 7);
         org.bukkit.block.BlockState state = block.getState();
         Material stateType = state.getType();
+        Material itemType = newItem.getType();
         if (stateType != itemType) {
-            if (stateType == Material.LEGACY_WALL_BANNER || stateType == Material.LEGACY_STANDING_BANNER) {
+            switch (stateType) {
-                if (itemType != Material.LEGACY_BANNER) {
+                case LEGACY_STANDING_BANNER:
-                    return;
+                case LEGACY_WALL_BANNER:
+                    if (itemType == Material.LEGACY_BANNER) {
+                        break;
                     }
-            } else if (stateType == Material.LEGACY_SKULL) {
+                case LEGACY_SKULL:
-                if (itemType != Material.LEGACY_SKULL_ITEM) {
+                    if (itemType == Material.LEGACY_SKULL_ITEM) {
-                    return;
+                        break;
                     }
-            } else {
+                default:
                     return;
             }
         }
@@ -918,10 +921,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
             if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
-                        TagResolver.resolver(
+                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD))
-                                "node",
-                                Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_ROAD)
-                        )
                 );
                 cancelled = true;
             }
@@ -929,10 +929,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
             if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
-                        TagResolver.resolver(
+                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED))
-                                "node",
-                                Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)
-                        )
                 );
                 cancelled = true;
             }
@@ -942,17 +939,14 @@ public class PlayerEventListener extends PlotListener implements Listener {
                 if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) {
                     pp.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER))
-                                    "node",
-                                    Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_OTHER)
-                            )
                     );
                     cancelled = true;
                 }
             }
         }
         if (cancelled) {
-            if ((oldItem.getType() == newItem.getType()) && (oldItem.getDurability() == newItem
+            if ((current.getType() == newItem.getType()) && (current.getDurability() == newItem
                     .getDurability())) {
                 event.setCursor(
                         new ItemStack(newItem.getType(), newItem.getAmount(), newItem.getDurability()));
@@ -983,10 +977,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
                     .hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
-                        TagResolver.resolver(
+                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD))
-                                "node",
-                                Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_ROAD)
-                        )
                 );
                 e.setCancelled(true);
             }
@@ -1004,10 +995,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
                 if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
                     pp.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED))
-                                    "node",
-                                    Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)
-                            )
                     );
                     e.setCancelled(true);
                 }
@@ -1022,10 +1010,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
                 if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) {
                     pp.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER))
-                                    "node",
-                                    Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_OTHER)
-                            )
                     );
                     e.setCancelled(true);
                     plot.debug(pp.getName() + " could not interact with " + entity.getType()
@@ -1148,21 +1133,14 @@ public class PlayerEventListener extends PlotListener implements Listener {
                     //Allow all players to eat while also allowing the block place event ot be fired
                     return;
                 }
-                if (type == Material.ARMOR_STAND) {
+                switch (type) {
+                    case ACACIA_BOAT, BIRCH_BOAT, CHEST_MINECART, COMMAND_BLOCK_MINECART, DARK_OAK_BOAT, FURNACE_MINECART, HOPPER_MINECART, JUNGLE_BOAT, MINECART, OAK_BOAT, SPRUCE_BOAT, TNT_MINECART -> eventType = PlayerBlockEventType.PLACE_VEHICLE;
+                    case FIREWORK_ROCKET, FIREWORK_STAR -> eventType = PlayerBlockEventType.SPAWN_MOB;
+                    case BOOK, KNOWLEDGE_BOOK, WRITABLE_BOOK, WRITTEN_BOOK -> eventType = PlayerBlockEventType.READ;
+                    case ARMOR_STAND -> {
                         location = BukkitUtil.adapt(block.getRelative(event.getBlockFace()).getLocation());
                         eventType = PlayerBlockEventType.PLACE_MISC;
                     }
-                if (org.bukkit.Tag.ITEMS_BOATS.isTagged(type) || MINECARTS.contains(type)) {
-                    eventType = PlayerBlockEventType.PLACE_VEHICLE;
-                    break;
-                }
-                if (type == Material.FIREWORK_ROCKET || type == Material.FIREWORK_STAR) {
-                    eventType = PlayerBlockEventType.SPAWN_MOB;
-                    break;
-                }
-                if (BOOKS.contains(type)) {
-                    eventType = PlayerBlockEventType.READ;
-                    break;
                 }
                 break;
             }
@@ -1252,7 +1230,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
             }
             pp.sendMessage(
                     TranslatableCaption.of("permission.no_permission_event"),
-                    TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD))
+                    Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
             );
             event.setCancelled(true);
         } else if (!plot.hasOwner()) {
@@ -1261,10 +1239,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
             }
             pp.sendMessage(
                     TranslatableCaption.of("permission.no_permission_event"),
-                    TagResolver.resolver(
+                    Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
-                            "node",
-                            Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
-                    )
             );
             event.setCancelled(true);
         } else if (!plot.isAdded(pp.getUUID())) {
@@ -1273,10 +1248,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
             }
             pp.sendMessage(
                     TranslatableCaption.of("permission.no_permission_event"),
-                    TagResolver.resolver(
+                    Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
-                            "node",
-                            Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
-                    )
             );
             event.setCancelled(true);
         } else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
@@ -1323,7 +1295,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
             }
             plotPlayer.sendMessage(
                     TranslatableCaption.of("permission.no_permission_event"),
-                    TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD))
+                    Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
             );
             event.setCancelled(true);
         } else if (!plot.hasOwner()) {
@@ -1332,10 +1304,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
             }
             plotPlayer.sendMessage(
                     TranslatableCaption.of("permission.no_permission_event"),
-                    TagResolver.resolver(
+                    Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
-                            "node",
-                            Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
-                    )
             );
             event.setCancelled(true);
         } else if (!plot.isAdded(plotPlayer.getUUID())) {
@@ -1344,10 +1313,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
             }
             plotPlayer.sendMessage(
                     TranslatableCaption.of("permission.no_permission_event"),
-                    TagResolver.resolver(
+                    Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
-                            "node",
-                            Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
-                    )
             );
             event.setCancelled(true);
         } else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
@@ -1379,10 +1345,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
             if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
-                        TagResolver.resolver(
+                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
-                                "node",
-                                Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD)
-                        )
                 );
                 event.setCancelled(true);
             }
@@ -1391,10 +1354,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
                 if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
                     pp.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
-                                    "node",
-                                    Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
-                            )
                     );
                     event.setCancelled(true);
                 }
@@ -1405,10 +1365,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
                     if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
                         pp.sendMessage(
                                 TranslatableCaption.of("permission.no_permission_event"),
-                                TagResolver.resolver(
+                                Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
-                                        "node",
-                                        Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
-                                )
                         );
                         event.setCancelled(true);
                     }
@@ -1437,10 +1394,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
                 if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_ROAD)) {
                     pp.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_ROAD))
-                                    "node",
-                                    Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_ROAD)
-                            )
                     );
                     event.setCancelled(true);
                 }
@@ -1448,10 +1402,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
                 if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
                     pp.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED))
-                                    "node",
-                                    Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)
-                            )
                     );
                     event.setCancelled(true);
                 }
@@ -1462,10 +1413,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
                 if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_OTHER)) {
                     pp.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER))
-                                    "node",
-                                    Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_OTHER)
-                            )
                     );
                     event.setCancelled(true);
                     plot.debug(p.getName()
@@ -1487,10 +1435,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
                                 .hasPermission(player, Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
                             player.sendMessage(
                                     TranslatableCaption.of("permission.no_permission_event"),
-                                    TagResolver.resolver(
+                                    Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED))
-                                            "node",
-                                            Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)
-                                    )
                             );
                             event.setCancelled(true);
                         }
@@ -1500,10 +1445,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
                                     .hasPermission(player, Permission.PERMISSION_ADMIN_DESTROY_OTHER)) {
                                 player.sendMessage(
                                         TranslatableCaption.of("permission.no_permission_event"),
-                                        TagResolver.resolver(
+                                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER))
-                                                "node",
-                                                Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_OTHER)
-                                        )
                                 );
                                 event.setCancelled(true);
                                 plot.debug(player.getName()
@@ -1535,10 +1477,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
             if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
-                        TagResolver.resolver(
+                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD))
-                                "node",
-                                Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_ROAD)
-                        )
                 );
                 event.setCancelled(true);
             }
@@ -1546,10 +1485,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
             if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
-                        TagResolver.resolver(
+                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED))
-                                "node",
-                                Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)
-                        )
                 );
                 event.setCancelled(true);
             }
@@ -1607,10 +1543,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
             if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
-                        TagResolver.resolver(
+                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER))
-                                "node",
-                                Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_OTHER)
-                        )
                 );
                 event.setCancelled(true);
             }
@@ -1632,10 +1565,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
                 if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD)) {
                     pp.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD))
-                                    "node",
-                                    Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD)
-                            )
                     );
                     event.setCancelled(true);
                 }
@@ -1644,10 +1574,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
                     if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED)) {
                         pp.sendMessage(
                                 TranslatableCaption.of("permission.no_permission_event"),
-                                TagResolver.resolver(
+                                Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED))
-                                        "node",
-                                        Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED)
-                                )
                         );
                         event.setCancelled(true);
                         return;
@@ -1661,10 +1588,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
                     if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER)) {
                         pp.sendMessage(
                                 TranslatableCaption.of("permission.no_permission_event"),
-                                TagResolver.resolver(
+                                Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER))
-                                        "node",
-                                        Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER)
-                                )
                         );
                         event.setCancelled(true);
                         plot.debug(pp.getName()

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -28,12 +35,9 @@ import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.PlotHandler;
-import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.Permissions;
-import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.Template;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -109,10 +113,7 @@ public class ProjectileEventListener implements Listener {
             if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
-                        TagResolver.resolver(
+                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD))
-                                "node",
-                                Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)
-                        )
                 );
                 entity.remove();
                 event.setCancelled(true);
@@ -121,30 +122,22 @@ public class ProjectileEventListener implements Listener {
             if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
-                        TagResolver.resolver(
+                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED))
-                                "node",
-                                Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)
-                        )
                 );
                 entity.remove();
                 event.setCancelled(true);
             }
         } else if (!plot.isAdded(pp.getUUID())) {
-            if (!plot.getFlag(ProjectilesFlag.class)) {
             if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER))
-                                    "node",
-                                    Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)
-                            )
                 );
                 entity.remove();
                 event.setCancelled(true);
             }
         }
     }
-    }
 
     @EventHandler
     public void onProjectileHit(ProjectileHitEvent event) {
@@ -169,7 +162,7 @@ public class ProjectileEventListener implements Listener {
                 return;
             }
             if (plot.isAdded(pp.getUUID()) || Permissions
-                    .hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER) || plot.getFlag(ProjectilesFlag.class)) {
+                    .hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
                 return;
             }
             entity.remove();

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -39,7 +46,7 @@ import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
 public class SingleWorldListener implements Listener {
 
     private final Method methodGetHandleChunk;
-    private Field shouldSave = null;
+    private Field shouldSave;
 
     public SingleWorldListener() throws Exception {
         ReflectionUtils.RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
@@ -52,12 +59,9 @@ public class SingleWorldListener implements Listener {
                 } else {
                     this.shouldSave = classChunk.getField("s").getRealField();
                 }
-            } else if (PlotSquared.platform().serverVersion()[1] == 17) {
+            } else {
                 ReflectionUtils.RefClass classChunk = getRefClass("net.minecraft.world.level.chunk.Chunk");
                 this.shouldSave = classChunk.getField("r").getRealField();
-            } else if (PlotSquared.platform().serverVersion()[1] == 18) {
-                ReflectionUtils.RefClass classChunk = getRefClass("net.minecraft.world.level.chunk.IChunkAccess");
-                this.shouldSave = classChunk.getField("b").getRealField();
             }
         } catch (NoSuchFieldException e) {
             e.printStackTrace();

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

Bukkit/src/main/java/com/plotsquared/bukkit/permissions/BukkitPermissionHandler.java

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

Bukkit/src/main/java/com/plotsquared/bukkit/permissions/VaultPermissionHandler.java

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/MVdWPlaceholders.java

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PAPIPlaceholders.java

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PlaceholderFormatter.java

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

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

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

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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -23,8 +30,7 @@ import com.plotsquared.bukkit.util.BukkitBlockUtil;
 import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.core.location.ChunkWrapper;
 import com.plotsquared.core.location.Location;
-import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
+import com.plotsquared.core.queue.ScopedQueueCoordinator;
-import com.plotsquared.core.util.AnnotationHelper;
 import com.plotsquared.core.util.ChunkUtil;
 import com.plotsquared.core.util.PatternUtil;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
@@ -44,8 +50,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.Arrays;
 
-@AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.")
+public class GenChunk extends ScopedQueueCoordinator {
-public class GenChunk extends ZeroedDelegateScopedQueueCoordinator {
 
     public final Biome[] biomes;
     public BlockState[][] result;
@@ -56,14 +61,8 @@ public class GenChunk extends ZeroedDelegateScopedQueueCoordinator {
     public int chunkZ;
     private ChunkData chunkData = null;
 
-    /**
+    public GenChunk() {
-     * @param minY minimum world Y, inclusive
+        super(null, Location.at("", 0, 0, 0), Location.at("", 15, 255, 15));
-     * @param maxY maximum world Y, inclusive
-     *
-     * @since 6.6.0
-     */
-    public GenChunk(int minY, int maxY) {
-        super(null, Location.at("", 0, minY, 0), Location.at("", 15, maxY, 15));
         this.biomes = Biome.values();
     }
 
@@ -103,7 +102,7 @@ public class GenChunk extends ZeroedDelegateScopedQueueCoordinator {
     /**
      * 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;
@@ -118,7 +117,7 @@ public class GenChunk extends ZeroedDelegateScopedQueueCoordinator {
             return;
         }
         Biome biome = BukkitAdapter.adapt(biomeType);
-        for (int y = getMin().getY(); y <= getMax().getY(); y++) {
+        for (int y = 0; y < 256; y++) {
             for (int x = 0; x < 16; x++) {
                 for (int z = 0; z < 16; z++) {
                     this.biomeGrid.setBiome(x, y, z, biome);
@@ -131,7 +130,7 @@ public class GenChunk extends ZeroedDelegateScopedQueueCoordinator {
     public void setCuboid(@NonNull Location pos1, @NonNull Location pos2, @NonNull BlockState block) {
         if (result != null && pos1.getX() == 0 && pos1.getZ() == 0 && pos2.getX() == 15 && pos2.getZ() == 15) {
             for (int y = pos1.getY(); y <= pos2.getY(); y++) {
-                int layer = getLayerIndex(y);
+                int layer = y >> 4;
                 BlockState[] data = result[layer];
                 if (data == null) {
                     result[layer] = data = new BlockState[4096];
@@ -165,7 +164,7 @@ public class GenChunk extends ZeroedDelegateScopedQueueCoordinator {
      */
     public boolean setBiome(int x, int z, @NonNull Biome biome) {
         if (this.biomeGrid != null) {
-            for (int y = getMin().getY(); y <= getMax().getY(); y++) {
+            for (int y = 0; y < 256; y++) {
                 this.setBiome(x, y, z, biome);
             }
             return true;
@@ -198,7 +197,7 @@ public class GenChunk extends ZeroedDelegateScopedQueueCoordinator {
     }
 
     private void storeCache(final int x, final int y, final int z, final @NonNull BlockState id) {
-        int i = getLayerIndex(y);
+        int i = y >> 4;
         BlockState[] v = this.result[i];
         if (v == null) {
             this.result[i] = v = new BlockState[4096];
@@ -220,7 +219,7 @@ public class GenChunk extends ZeroedDelegateScopedQueueCoordinator {
 
     @Override
     public @Nullable BlockState getBlock(int x, int y, int z) {
-        int i = getLayerIndex(y);
+        int i = y >> 4;
         if (result == null) {
             return BukkitBlockUtil.get(chunkData.getType(x, y, z));
         }
@@ -247,16 +246,16 @@ public class GenChunk extends ZeroedDelegateScopedQueueCoordinator {
 
     @Override
     public @NonNull Location getMax() {
-        return Location.at(getWorld().getName(), 15 + (getX() << 4), super.getMax().getY(), 15 + (getZ() << 4));
+        return Location.at(getWorld().getName(), 15 + (getX() << 4), 255, 15 + (getZ() << 4));
     }
 
     @Override
     public @NonNull Location getMin() {
-        return Location.at(getWorld().getName(), getX() << 4, super.getMin().getY(), getZ() << 4);
+        return Location.at(getWorld().getName(), getX() << 4, 0, getZ() << 4);
     }
 
     public @NonNull GenChunk clone() {
-        GenChunk toReturn = new GenChunk(getMin().getY(), getMax().getY());
+        GenChunk toReturn = new GenChunk();
         if (this.result != null) {
             for (int i = 0; i < this.result.length; i++) {
                 BlockState[] matrix = this.result[i];
@@ -270,8 +269,4 @@ public class GenChunk extends ZeroedDelegateScopedQueueCoordinator {
         return toReturn;
     }
 
-    private int getLayerIndex(int y) {
-        return (y - getMin().getY()) >> 4;
-    }
-
 }

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

@@ -1,121 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.queue;
-
-import com.plotsquared.bukkit.schematic.StateWrapper;
-import com.plotsquared.core.queue.DelegateQueueCoordinator;
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.entity.Entity;
-import com.sk89q.worldedit.function.pattern.Pattern;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.world.block.BaseBlock;
-import com.sk89q.worldedit.world.block.BlockState;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.bukkit.Location;
-import org.bukkit.entity.EntityType;
-import org.bukkit.generator.LimitedRegion;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-/**
- * Wraps a {@link LimitedRegion} inside a {@link com.plotsquared.core.queue.QueueCoordinator} so it can be written to.
- *
- * @since 6.9.0
- */
-public class LimitedRegionWrapperQueue extends DelegateQueueCoordinator {
-
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + LimitedRegionWrapperQueue.class.getSimpleName());
-
-    private final LimitedRegion limitedRegion;
-
-    /**
-     * @since 6.9.0
-     */
-    public LimitedRegionWrapperQueue(LimitedRegion limitedRegion) {
-        super(null);
-        this.limitedRegion = limitedRegion;
-    }
-
-    @Override
-    public boolean setBlock(final int x, final int y, final int z, @NonNull final Pattern pattern) {
-        return setBlock(x, y, z, pattern.applyBlock(BlockVector3.at(x, y, z)));
-    }
-
-    @Override
-    public boolean setBlock(final int x, final int y, final int z, @NonNull final BaseBlock id) {
-        boolean result = setBlock(x, y, z, id.toImmutableState());
-        if (result && id.hasNbtData()) {
-            CompoundTag tag = id.getNbtData();
-            StateWrapper sw = new StateWrapper(tag);
-            try {
-                sw.restoreTag(limitedRegion.getBlockState(x, y, z).getBlock());
-            } catch (IllegalArgumentException e) {
-                LOGGER.error("Error attempting to populate tile entity into the world at location {},{},{}", x, y, z, e);
-                return false;
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public boolean setBlock(final int x, final int y, final int z, @NonNull final BlockState id) {
-        try {
-            limitedRegion.setType(x, y, z, BukkitAdapter.adapt(id.getBlockType()));
-            limitedRegion.setBlockData(x, y, z, BukkitAdapter.adapt(id));
-        } catch (IllegalArgumentException e) {
-            LOGGER.error("Error attempting to populate block into the world at location {},{},{}", x, y, z, e);
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public boolean setEntity(@NonNull final Entity entity) {
-        EntityType type = BukkitAdapter.adapt(entity.getState().getType());
-        double x = entity.getLocation().getX();
-        double y = entity.getLocation().getY();
-        double z = entity.getLocation().getZ();
-        Location location = new Location(limitedRegion.getWorld(), x, y, z);
-        try {
-            limitedRegion.spawnEntity(location, type);
-        } catch (IllegalArgumentException e) {
-            LOGGER.error("Error attempting to populate entity into the world at location {},{},{}", (int) x, (int) y, (int) z, e);
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public boolean setTile(final int x, final int y, final int z, @NonNull final CompoundTag tag) {
-        StateWrapper sw = new StateWrapper(tag);
-        try {
-            return sw.restoreTag(limitedRegion.getBlockState(x, y, z).getBlock());
-        } catch (IllegalArgumentException e) {
-            LOGGER.error("Error attempting to populate tile entity into the world at location {},{},{}", x, y, z, e);
-            return false;
-        }
-    }
-
-    @Override
-    public boolean isSettingTiles() {
-        return true;
-    }
-
-}

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -28,18 +35,15 @@ import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.blocks.BaseItemStack;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.world.item.ItemType;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.Container;
 import org.bukkit.block.Sign;
-import org.bukkit.block.Skull;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -52,11 +56,6 @@ public class StateWrapper {
     public org.bukkit.block.BlockState state = null;
     public CompoundTag tag = null;
 
-    /**
-     * @deprecated in favour of using WE methods for obtaining NBT, specifically by obtaining a
-     *         {@link com.sk89q.worldedit.world.block.BaseBlock} and then using {@link com.sk89q.worldedit.world.block.BaseBlock#getNbtData()}
-     */
-    @Deprecated(forRemoval = true, since = "6.9.0")
     public StateWrapper(org.bukkit.block.BlockState state) {
         this.state = state;
     }
@@ -167,32 +166,14 @@ public class StateWrapper {
         return str;
     }
 
-    /**
+    @SuppressWarnings("deprecation") // #setLine is needed for Spigot compatibility
-     * Restore the TileEntity data to the given world at the given coordinates.
-     *
-     * @param worldName World name
-     * @param x         x position
-     * @param y         y position
-     * @param z         z position
-     * @return true if successful
-     */
     public boolean restoreTag(String worldName, int x, int y, int z) {
-        World world = BukkitUtil.getWorld(worldName);
+        if (this.tag == null) {
-        if (world == null) {
             return false;
         }
-        return restoreTag(world.getBlockAt(x, y, z));
+        World world = BukkitUtil.getWorld(worldName);
-    }
+        Block block = world.getBlockAt(x, y, z);
-
+        if (block == null) {
-    /**
-     * Restore the TileEntity data to the given block
-     *
-     * @param block Block to restore to
-     * @return true if successful
-     */
-    @SuppressWarnings("deprecation") // #setLine is needed for Spigot compatibility
-    public boolean restoreTag(@NonNull Block block) {
-        if (this.tag == null) {
             return false;
         }
         org.bukkit.block.BlockState state = block.getState();
@@ -230,37 +211,10 @@ public class StateWrapper {
                 }
                 return false;
             }
-            case "skull" -> {
-                if (state instanceof Skull skull) {
-                    CompoundTag skullOwner = ((CompoundTag) this.tag.getValue().get("SkullOwner"));
-                    if (skullOwner == null) {
-                        return true;
-                    }
-                    String player = skullOwner.getString("Name");
-                    if (player == null || player.isEmpty()) {
-                        return false;
-                    }
-                    try {
-                        skull.setOwningPlayer(Bukkit.getOfflinePlayer(player));
-                        skull.update(true);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    return true;
-                }
-                return false;
-            }
         }
         return false;
     }
 
-    /**
-     * Get a CompoundTag of the contents of a block's inventory (chest, furnace, etc.).
-     *
-     * @deprecated in favour of using WorldEdit methods for obtaining NBT, specifically by obtaining a
-     *         {@link com.sk89q.worldedit.world.block.BaseBlock} and then using {@link com.sk89q.worldedit.world.block.BaseBlock#getNbtData()}
-     */
-    @Deprecated(forRemoval = true, since = "6.9.0")
     public CompoundTag getTag() {
         if (this.tag != null) {
             return this.tag;

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -43,9 +50,7 @@ import com.plotsquared.core.util.EntityUtil;
 import com.plotsquared.core.util.Permissions;
 import com.plotsquared.core.util.entity.EntityCategories;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.Template;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Creature;
 import org.bukkit.entity.Entity;
@@ -183,10 +188,7 @@ public class BukkitEntityUtil {
                 if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) {
                     plotPlayer.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", Permission.PERMISSION_ADMIN_DESTROY + "." + stub)
-                                    "node",
-                                    Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_DESTROY + "." + stub))
-                            )
                     );
                     return false;
                 }
@@ -198,10 +200,7 @@ public class BukkitEntityUtil {
                 if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) {
                     plotPlayer.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", Permission.PERMISSION_ADMIN_DESTROY + "." + stub)
-                                    "node",
-                                    Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_DESTROY + "." + stub))
-                            )
                     );
                     if (plot != null) {
                         plot.debug(player.getName()
@@ -222,10 +221,7 @@ public class BukkitEntityUtil {
                 if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
                     plotPlayer.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
-                                    "node",
-                                    Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
-                            )
                     );
                     if (plot != null) {
                         plot.debug(player.getName() + " could not attack " + entityType
@@ -246,10 +242,7 @@ public class BukkitEntityUtil {
                 if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
                     plotPlayer.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
-                                    "node",
-                                    Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
-                            )
                     );
                     if (plot != null) {
                         plot.debug(player.getName() + " could not attack " + entityType
@@ -263,10 +256,7 @@ public class BukkitEntityUtil {
                             .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVP + "." + stub)) {
                         plotPlayer.sendMessage(
                                 TranslatableCaption.of("permission.no_permission_event"),
-                                TagResolver.resolver(
+                                Template.of("node", Permission.PERMISSION_ADMIN_PVP + "." + stub)
-                                        "node",
-                                        Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVP + "." + stub))
-                                )
                         );
                         plot.debug(player.getName() + " could not attack " + entityType
                                 + " because pve = false");
@@ -280,10 +270,7 @@ public class BukkitEntityUtil {
                 if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVP + "." + stub)) {
                     plotPlayer.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", Permission.PERMISSION_ADMIN_PVP + "." + stub)
-                                    "node",
-                                    Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVP + "." + stub))
-                            )
                     );
                     return false;
                 }
@@ -300,10 +287,7 @@ public class BukkitEntityUtil {
                 if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
                     plotPlayer.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
-                                    "node",
-                                    Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
-                            )
                     );
                     if (plot != null) {
                         plot.debug(player.getName() + " could not attack " + entityType
@@ -325,10 +309,7 @@ public class BukkitEntityUtil {
                 if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
                     plotPlayer.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
-                            TagResolver.resolver(
+                            Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
-                                    "node",
-                                    Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
-                            )
                     );
                     if (plot != null) {
                         plot.debug(player.getName() + " could not attack " + entityType

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -56,7 +63,7 @@ public class BukkitInventoryUtil extends InventoryUtil {
         ItemMeta meta = null;
         if (item.getName() != null) {
             meta = stack.getItemMeta();
-            Component nameComponent = BukkitUtil.MINI_MESSAGE.deserialize(item.getName());
+            Component nameComponent = BukkitUtil.MINI_MESSAGE.parse(item.getName());
             meta.setDisplayName(BukkitUtil.LEGACY_COMPONENT_SERIALIZER.serialize(nameComponent));
         }
         if (item.getLore() != null) {

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -30,9 +37,10 @@ import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.PlotManager;
 import com.plotsquared.core.queue.GlobalBlockQueue;
 import com.plotsquared.core.queue.QueueCoordinator;
-import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
+import com.plotsquared.core.queue.ScopedQueueCoordinator;
 import com.plotsquared.core.util.ChunkManager;
 import com.plotsquared.core.util.RegionManager;
+import com.plotsquared.core.util.RegionUtil;
 import com.plotsquared.core.util.WorldUtil;
 import com.plotsquared.core.util.entity.EntityCategories;
 import com.plotsquared.core.util.task.RunnableVal;
@@ -253,13 +261,13 @@ public class BukkitRegionManager extends RegionManager {
             if (checkX2 && checkZ2) {
                 map.saveRegion(world, xxt2, xxt, zzt2, zzt); //
             }
-            CuboidRegion currentPlotClear = new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3());
+            CuboidRegion currentPlotClear = RegionUtil.createRegion(pos1.getX(), pos2.getX(), pos1.getZ(), pos2.getZ());
             map.saveEntitiesOut(Bukkit.getWorld(world.getName()).getChunkAt(x, z), currentPlotClear);
             AugmentedUtils.bypass(
                     ignoreAugment,
-                    () -> ChunkManager.setChunkInPlotArea(null, new RunnableVal<ZeroedDelegateScopedQueueCoordinator>() {
+                    () -> ChunkManager.setChunkInPlotArea(null, new RunnableVal<ScopedQueueCoordinator>() {
                         @Override
-                        public void run(ZeroedDelegateScopedQueueCoordinator value) {
+                        public void run(ScopedQueueCoordinator value) {
                             Location min = value.getMin();
                             int bx = min.getX();
                             int bz = min.getZ();
@@ -268,16 +276,20 @@ public class BukkitRegionManager extends RegionManager {
                                     PlotLoc plotLoc = new PlotLoc(bx + x1, bz + z1);
                                     BaseBlock[] ids = map.allBlocks.get(plotLoc);
                                     if (ids != null) {
-                                        int minY = value.getMin().getY();
+                                        for (int y = 0; y < Math.min(128, ids.length); y++) {
-                                        for (int yIndex = 0; yIndex < ids.length; yIndex++) {
+                                            BaseBlock id = ids[y];
-                                            int y = yIndex + minY;
-                                            BaseBlock id = ids[yIndex];
                                             if (id != null) {
                                                 value.setBlock(x1, y, z1, id);
                                             } else {
                                                 value.setBlock(x1, y, z1, BlockTypes.AIR.getDefaultState());
                                             }
                                         }
+                                        for (int y = Math.min(128, ids.length); y < ids.length; y++) {
+                                            BaseBlock id = ids[y];
+                                            if (id != null) {
+                                                value.setBlock(x1, y, z1, id);
+                                            }
+                                        }
                                     }
                                 }
                             }
@@ -285,7 +297,7 @@ public class BukkitRegionManager extends RegionManager {
                     }, world.getName(), chunk)
             );
             //map.restoreBlocks(worldObj, 0, 0);
-            map.restoreEntities(Bukkit.getWorld(world.getName()));
+            map.restoreEntities(Bukkit.getWorld(world.getName()), 0, 0);
         });
         regenQueue.setCompleteTask(whenDone);
         queue.setCompleteTask(regenQueue::enqueue);

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -69,7 +76,7 @@ public class BukkitSetupUtils extends SetupUtils {
 
     @Override
     public void updateGenerators(final boolean force) {
-        if (loaded && !SetupUtils.generators.isEmpty() && !force) {
+        if (!SetupUtils.generators.isEmpty() && !force) {
             return;
         }
         String testWorld = "CheckingPlotSquaredGenerator";
@@ -93,7 +100,6 @@ public class BukkitSetupUtils extends SetupUtils {
                 e.printStackTrace();
             }
         }
-        loaded = true;
     }
 
     @Override

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -37,6 +44,7 @@ import com.plotsquared.core.util.task.TaskManager;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.bukkit.BukkitWorld;
 import com.sk89q.worldedit.math.BlockVector2;
+import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BlockCategories;
 import com.sk89q.worldedit.world.block.BlockState;
@@ -45,7 +53,7 @@ import com.sk89q.worldedit.world.block.BlockTypes;
 import io.papermc.lib.PaperLib;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import net.kyori.adventure.text.minimessage.Template;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -53,6 +61,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.Sign;
@@ -237,9 +246,7 @@ public class BukkitUtil extends WorldUtil {
             final World bukkitWorld = Objects.requireNonNull(getWorld(world));
             // Skip top and bottom block
             int air = 1;
-            int maxY = com.plotsquared.bukkit.util.BukkitWorld.getMaxWorldHeight(bukkitWorld);
+            for (int y = bukkitWorld.getMaxHeight() - 1; y >= 0; y--) {
-            int minY = com.plotsquared.bukkit.util.BukkitWorld.getMinWorldHeight(bukkitWorld);
-            for (int y = maxY - 1; y >= minY; y--) {
                 Block block = bukkitWorld.getBlockAt(x, y, z);
                 Material type = block.getType();
                 if (type.isSolid()) {
@@ -266,9 +273,7 @@ public class BukkitUtil extends WorldUtil {
         final World bukkitWorld = Objects.requireNonNull(getWorld(world));
         // Skip top and bottom block
         int air = 1;
-        int maxY = com.plotsquared.bukkit.util.BukkitWorld.getMaxWorldHeight(bukkitWorld);
+        for (int y = bukkitWorld.getMaxHeight() - 1; y >= 0; y--) {
-        int minY = com.plotsquared.bukkit.util.BukkitWorld.getMinWorldHeight(bukkitWorld);
-        for (int y = maxY - 1; y >= minY; y--) {
             Block block = bukkitWorld.getBlockAt(x, y, z);
             Material type = block.getType();
             if (type.isSolid()) {
@@ -332,7 +337,7 @@ public class BukkitUtil extends WorldUtil {
     @SuppressWarnings("deprecation")
     public void setSign(
             final @NonNull Location location, final @NonNull Caption[] lines,
-            final @NonNull TagResolver... replacements
+            final @NonNull Template... replacements
     ) {
         ensureLoaded(location.getWorldName(), location.getX(), location.getZ(), chunk -> {
             PlotArea area = location.getPlotArea();
@@ -340,16 +345,14 @@ public class BukkitUtil extends WorldUtil {
             final Block block = world.getBlockAt(location.getX(), location.getY(), location.getZ());
             final Material type = block.getType();
             if (type != Material.LEGACY_SIGN && type != Material.LEGACY_WALL_SIGN) {
-                BlockFace facing = BlockFace.NORTH;
+                BlockFace facing = BlockFace.EAST;
-                if (!world.getBlockAt(location.getX(), location.getY(), location.getZ() + 1).getType().isSolid()) {
+                if (world.getBlockAt(location.getX(), location.getY(), location.getZ() + 1).getType().isSolid()) {
-                    if (world.getBlockAt(location.getX() - 1, location.getY(), location.getZ()).getType().isSolid()) {
+                    facing = BlockFace.NORTH;
-                        facing = BlockFace.EAST;
                 } else if (world.getBlockAt(location.getX() + 1, location.getY(), location.getZ()).getType().isSolid()) {
                     facing = BlockFace.WEST;
                 } else if (world.getBlockAt(location.getX(), location.getY(), location.getZ() - 1).getType().isSolid()) {
                     facing = BlockFace.SOUTH;
                 }
-                }
                 if (PlotSquared.platform().serverVersion()[1] == 13) {
                     block.setType(Material.valueOf(area.legacySignMaterial()), false);
                 } else {
@@ -365,11 +368,10 @@ public class BukkitUtil extends WorldUtil {
             final org.bukkit.block.BlockState blockstate = block.getState();
             if (blockstate instanceof final Sign sign) {
                 for (int i = 0; i < lines.length; i++) {
-                    sign.setLine(i, LEGACY_COMPONENT_SERIALIZER.serialize(
+                    sign.setLine(i, LEGACY_COMPONENT_SERIALIZER
-                            MINI_MESSAGE.deserialize(lines[i].getComponent(LocaleHolder.console()), replacements)
+                            .serialize(MINI_MESSAGE.parse(lines[i].getComponent(LocaleHolder.console()), replacements)));
-                    ));
                 }
-                sign.update(true, false);
+                sign.update(true);
             }
         });
     }
@@ -380,6 +382,27 @@ public class BukkitUtil extends WorldUtil {
         return new StringComparison<BlockState>().new ComparisonResult(1, state);
     }
 
+    @Override
+    public void setBiomes(
+            final @NonNull String worldName,
+            final @NonNull CuboidRegion region,
+            final @NonNull BiomeType biomeType
+    ) {
+        final World world = getWorld(worldName);
+        if (world == null) {
+            LOGGER.warn("An error occurred while setting the biome because the world was null", new RuntimeException());
+            return;
+        }
+        final Biome biome = BukkitAdapter.adapt(biomeType);
+        for (int x = region.getMinimumPoint().getX(); x <= region.getMaximumPoint().getX(); x++) {
+            for (int z = region.getMinimumPoint().getZ(); z <= region.getMaximumPoint().getZ(); z++) {
+                if (world.getBiome(x, z) != biome) {
+                    world.setBiome(x, z, biome);
+                }
+            }
+        }
+    }
+
     @Override
     public com.sk89q.worldedit.world.@NonNull World getWeWorld(final @NonNull String world) {
         return new BukkitWorld(Bukkit.getWorld(world));

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -24,22 +31,11 @@ import org.bukkit.Bukkit;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Map;
+import java.util.Objects;
 
 public class BukkitWorld implements World<org.bukkit.World> {
 
     private static final Map<String, BukkitWorld> worldMap = Maps.newHashMap();
-    private static final boolean HAS_MIN_Y;
-
-    static {
-        boolean temp;
-        try {
-            org.bukkit.World.class.getMethod("getMinHeight");
-            temp = true;
-        } catch (NoSuchMethodException e) {
-            temp = false;
-        }
-        HAS_MIN_Y = temp;
-    }
 
     private final org.bukkit.World world;
 
@@ -77,24 +73,6 @@ public class BukkitWorld implements World<org.bukkit.World> {
         return bukkitWorld;
     }
 
-    /**
-     * Get the min world height from a Bukkit {@link org.bukkit.World}. Inclusive
-     *
-     * @since 6.6.0
-     */
-    public static int getMinWorldHeight(org.bukkit.World world) {
-        return HAS_MIN_Y ? world.getMinHeight() : 0;
-    }
-
-    /**
-     * Get the max world height from a Bukkit {@link org.bukkit.World}. Exclusive
-     *
-     * @since 6.6.0
-     */
-    public static int getMaxWorldHeight(org.bukkit.World world) {
-        return HAS_MIN_Y ? world.getMaxHeight() : 256;
-    }
-
     @Override
     public org.bukkit.World getPlatformWorld() {
         return this.world;
@@ -105,16 +83,6 @@ public class BukkitWorld implements World<org.bukkit.World> {
         return this.world.getName();
     }
 
-    @Override
-    public int getMinHeight() {
-        return getMinWorldHeight(world);
-    }
-
-    @Override
-    public int getMaxHeight() {
-        return getMaxWorldHeight(world) - 1;
-    }
-
     @Override
     public boolean equals(final Object o) {
         if (this == o) {
@@ -132,6 +100,14 @@ public class BukkitWorld implements World<org.bukkit.World> {
         return world.hashCode();
     }
 
+    /**
+     * @deprecated This method is not meant to be invoked or overridden, with no replacement.
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
+    protected boolean canEqual(final Object other) {
+        return other instanceof BukkitWorld;
+    }
+
     public String toString() {
         return "BukkitWorld(world=" + this.world + ")";
     }

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -63,7 +70,7 @@ public class ContentMap {
         }
         for (int x = x1; x <= x2; x++) {
             for (int z = z1; z <= z2; z++) {
-                saveBlocks(world, x, z);
+                saveBlocks(world, 256, x, z, 0, 0);
             }
         }
     }
@@ -85,7 +92,14 @@ public class ContentMap {
         }
     }
 
-    void saveEntitiesIn(Chunk chunk, CuboidRegion region, boolean delete) {
+    void saveEntitiesIn(Chunk chunk, CuboidRegion region) {
+        saveEntitiesIn(chunk, region, 0, 0, false);
+    }
+
+    void saveEntitiesIn(
+            Chunk chunk, CuboidRegion region, int offsetX, int offsetZ,
+            boolean delete
+    ) {
         for (Entity entity : chunk.getEntities()) {
             Location location = BukkitUtil.adapt(entity.getLocation());
             int x = location.getX();
@@ -97,6 +111,8 @@ public class ContentMap {
                 continue;
             }
             EntityWrapper wrap = new ReplicatingEntityWrapper(entity, (short) 2);
+            wrap.x += offsetX;
+            wrap.z += offsetZ;
             wrap.saveEntity();
             this.entities.add(wrap);
             if (delete) {
@@ -107,10 +123,10 @@ public class ContentMap {
         }
     }
 
-    void restoreEntities(World world) {
+    void restoreEntities(World world, int xOffset, int zOffset) {
         for (EntityWrapper entity : this.entities) {
             try {
-                entity.spawn(world, 0, 0);
+                entity.spawn(world, xOffset, zOffset);
             } catch (Exception e) {
                 LOGGER.error("Failed to restore entity", e);
             }
@@ -118,13 +134,15 @@ public class ContentMap {
         this.entities.clear();
     }
 
-    private void saveBlocks(BukkitWorld world, int x, int z) {
+    //todo optimize maxY
-        BaseBlock[] ids = new BaseBlock[world.getMaxY() - world.getMinY() + 1];
+    void saveBlocks(BukkitWorld world, int maxY, int x, int z, int offsetX, int offsetZ) {
-        for (short yIndex = 0; yIndex <= world.getMaxY() - world.getMinY(); yIndex++) {
+        maxY = Math.min(255, maxY);
-            BaseBlock block = world.getFullBlock(BlockVector3.at(x, yIndex + world.getMinY(), z));
+        BaseBlock[] ids = new BaseBlock[maxY + 1];
-            ids[yIndex] = block;
+        for (short y = 0; y <= maxY; y++) {
+            BaseBlock block = world.getFullBlock(BlockVector3.at(x, y, z));
+            ids[y] = block;
         }
-        PlotLoc loc = new PlotLoc(x, z);
+        PlotLoc loc = new PlotLoc(x + offsetX, z + offsetZ);
         this.allBlocks.put(loc, ids);
     }
 

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -99,8 +106,8 @@ public class FaweRegionManager extends BukkitRegionManager {
     }
 
     @Override
-    public void setBiome(CuboidRegion region, int extendBiome, BiomeType biome, PlotArea area, Runnable whenDone) {
+    public void setBiome(CuboidRegion region, int extendBiome, BiomeType biome, String world, Runnable whenDone) {
-        delegate.setBiome(region, extendBiome, biome, area.getWorldName(), whenDone);
+        delegate.setBiome(region, extendBiome, biome, world, whenDone);
     }
 
     @Override

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -60,7 +67,7 @@ public class FaweSchematicHandler extends SchematicHandler {
             final PlotPlayer<?> actor,
             final RunnableVal<Boolean> whenDone
     ) {
-        delegate.paste(schematic, plot, xOffset, yOffset, zOffset, autoHeight, actor, whenDone);
+        delegate.paste(schematic, plot, xOffset, yOffset, zOffset, autoHeight, whenDone);
     }
 
     @Override

Bukkit/src/main/java/com/plotsquared/bukkit/util/task/BukkitPlotSquaredTask.java

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

Bukkit/src/main/java/com/plotsquared/bukkit/util/task/BukkitTaskManager.java

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

Bukkit/src/main/java/com/plotsquared/bukkit/util/task/PaperTimeConverter.java

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

Bukkit/src/main/java/com/plotsquared/bukkit/util/task/SpigotTimeConverter.java

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at contact@intellectualsites.com. All
+reported by contacting the project team at contact@alexander-soderberg.com. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

Core/build.gradle.kts

@@ -2,18 +2,18 @@ import java.time.format.DateTimeFormatter
 
 dependencies {
     // Expected everywhere.
-    compileOnlyApi("org.checkerframework:checker-qual")
+    compileOnlyApi(libs.checkerqual)
 
     // Minecraft expectations
-    compileOnlyApi("com.google.code.gson:gson")
+    compileOnlyApi(libs.gson)
-    compileOnly("com.google.guava:guava")
+    compileOnly(libs.guava)
 
     // Platform expectations
-    compileOnlyApi("org.yaml:snakeyaml")
+    compileOnlyApi(libs.snakeyaml)
 
     // Adventure
-    api("net.kyori:adventure-api")
+    api(libs.adventure)
-    api("net.kyori:adventure-text-minimessage")
+    api(libs.minimessage)
 
     // Guice
     api(libs.guice) {
@@ -22,7 +22,7 @@ dependencies {
     api(libs.guiceassistedinject) {
         exclude("com.google.inject", "guice")
     }
-    api(libs.spotbugs)
+    api(libs.findbugs)
 
     // Plugins
     compileOnly(libs.worldeditCore) {
@@ -31,18 +31,18 @@ dependencies {
         exclude(group = "dummypermscompat")
     }
     testImplementation(libs.worldeditCore)
-    compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core") { isTransitive = false }
+    compileOnly(libs.fastasyncworldeditCore) { isTransitive = false }
-    testImplementation("com.fastasyncworldedit:FastAsyncWorldEdit-Core") { 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/")
     }

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -30,7 +37,7 @@ import com.plotsquared.core.util.ChunkManager;
 import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.SchematicHandler;
 import com.plotsquared.core.util.query.PlotQuery;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import net.kyori.adventure.text.minimessage.Template;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -145,7 +152,7 @@ public class PlotAPI {
      */
     public void sendConsoleMessage(
             final @NonNull String message,
-            final @NonNull TagResolver @NonNull ... replacements
+            final @NonNull Template @NonNull ... replacements
     ) {
         ConsolePlayer.getConsole().sendMessage(StaticCaption.of(message), replacements);
     }
@@ -158,7 +165,7 @@ public class PlotAPI {
      */
     public void sendConsoleMessage(
             final @NonNull Caption caption,
-            final @NonNull TagResolver @NonNull ... replacements
+            final @NonNull Template @NonNull ... replacements
     ) {
         ConsolePlayer.getConsole().sendMessage(caption, replacements);
     }

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -91,22 +98,6 @@ public interface PlotPlatform<P> extends LocaleHolder {
      */
     int[] serverVersion();
 
-    /**
-     * Gets the default minimum world height for the version of Minecraft that the server is running.
-     *
-     * @return minimum world height
-     * @since 6.6.0
-     */
-    int versionMinHeight();
-
-    /**
-     * Gets the default maximum world height for the version of Minecraft that the server is running.
-     *
-     * @return maximum world height (inclusive)
-     * @since 6.6.0
-     */
-    int versionMaxHeight();
-
     /**
      * Gets the server implementation name and version
      *
@@ -352,9 +343,9 @@ public interface PlotPlatform<P> extends LocaleHolder {
     @NonNull String toLegacyPlatformString(@NonNull Component component);
 
     /**
-     * Returns if the FastAsyncWorldEdit-PlotSquared hook is active/enabled
+     * Returns if the FAWE-P2 hook is active/enabled
      *
-     * @return status of FastAsyncWorldEdit-PlotSquared hook
+     * @return status of FAWE-P2 hook
      */
     default boolean isFaweHooking() {
         return false;

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -65,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;
@@ -149,8 +153,6 @@ public class PlotSquared {
     private EventDispatcher eventDispatcher;
     private PlotListener plotListener;
 
-    private boolean weInitialised;
-
     /**
      * Initialize PlotSquared with the desired Implementation class.
      *
@@ -221,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);
@@ -786,9 +787,7 @@ public class PlotSquared {
         if (world.equals("CheckingPlotSquaredGenerator")) {
             return;
         }
-        if (!this.getPlotAreaManager().addWorld(world)) {
+        this.getPlotAreaManager().addWorld(world);
-            return;
-        }
         Set<String> worlds;
         if (this.worldConfiguration.contains("worlds")) {
             worlds = this.worldConfiguration.getConfigurationSection("worlds").getKeys(false);
@@ -890,8 +889,8 @@ public class PlotSquared {
                             e.printStackTrace();
                         }
                         LOGGER.info("| generator: {}>{}", baseGenerator, areaGen);
-                        LOGGER.info("| plot world: {}", pa.getClass().getCanonicalName());
+                        LOGGER.info("| plot world: {}", pa);
-                        LOGGER.info("| manager: {}", pa.getPlotManager().getClass().getCanonicalName());
+                        LOGGER.info("| manager: {}", pa);
                         LOGGER.info("Note: Area created for cluster '{}' (invalid or old configuration?)", name);
                         areaGen.getPlotGenerator().initialize(pa);
                         areaGen.augment(pa);
@@ -907,13 +906,6 @@ public class PlotSquared {
                     throw new IllegalArgumentException("Invalid Generator: " + gen_string);
                 }
                 PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, null, null, null);
-                LOGGER.info("- generator: {}>{}", baseGenerator, areaGen);
-                LOGGER.info("- plot world: {}", pa.getClass().getCanonicalName());
-                LOGGER.info("- plot area manager: {}", pa.getPlotManager().getClass().getCanonicalName());
-                if (!this.worldConfiguration.contains(path)) {
-                    this.worldConfiguration.createSection(path);
-                    worldSection = this.worldConfiguration.getConfigurationSection(path);
-                }
                 pa.saveConfiguration(worldSection);
                 pa.loadDefaultConfiguration(worldSection);
                 try {
@@ -921,6 +913,9 @@ public class PlotSquared {
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
+                LOGGER.info("- generator: {}>{}", baseGenerator, areaGen);
+                LOGGER.info("- plot world: {}", pa);
+                LOGGER.info("- plot area manager: {}", pa.getPlotManager());
                 areaGen.getPlotGenerator().initialize(pa);
                 areaGen.augment(pa);
                 addPlotArea(pa);
@@ -1025,8 +1020,8 @@ public class PlotSquared {
             // save configuration
 
             final List<String> validArguments = Arrays
-                    .asList("s=", "size=", "g=", "gap=", "h=", "height=", "minh=", "minheight=", "maxh=", "maxheight=",
+                    .asList("s=", "size=", "g=", "gap=", "h=", "height=", "f=", "floor=", "m=", "main=",
-                            "f=", "floor=", "m=", "main=", "w=", "wall=", "b=", "border="
+                            "w=", "wall=", "b=", "border="
                     );
 
             // Calculate the number of expected arguments
@@ -1105,14 +1100,6 @@ public class PlotSquared {
                                     ConfigurationUtil.INTEGER.parseString(value).shortValue()
                             );
                         }
-                        case "minh", "minheight" -> this.worldConfiguration.set(
-                                base + "world.min_gen_height",
-                                ConfigurationUtil.INTEGER.parseString(value).shortValue()
-                        );
-                        case "maxh", "maxheight" -> this.worldConfiguration.set(
-                                base + "world.max_gen_height",
-                                ConfigurationUtil.INTEGER.parseString(value).shortValue()
-                        );
                         case "f", "floor" -> this.worldConfiguration.set(
                                 base + "plot.floor",
                                 ConfigurationUtil.BLOCK_BUCKET.parseString(value).toString()
@@ -1575,13 +1562,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}
      */
@@ -1604,15 +1584,4 @@ public class PlotSquared {
         DISTANCE_FROM_ORIGIN
     }
 
-    private final class WEPlatformReadyListener {
-
-        @SuppressWarnings("unused")
-        @Subscribe(priority = EventHandler.Priority.VERY_EARLY)
-        public void onPlatformReady(PlatformReadyEvent event) {
-            weInitialised = true;
-            WorldEdit.getInstance().getEventBus().unregister(WEPlatformReadyListener.this);
-        }
-
-    }
-
 }

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -200,7 +207,7 @@ public class PlayerBackupProfile implements BackupProfile {
                                     if (value) {
                                         future.complete(null);
                                     } else {
-                                        future.completeExceptionally(new RuntimeException(MINI_MESSAGE.escapeTags(
+                                        future.completeExceptionally(new RuntimeException(MINI_MESSAGE.stripTokens(
                                                 TranslatableCaption
                                                         .of("schematics.schematic_paste_failed")
                                                         .getComponent(ConsolePlayer.getConsole()))));

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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
@@ -24,14 +31,13 @@ import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
+import com.plotsquared.core.configuration.caption.Templates;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.inject.factory.PlayerBackupProfileFactory;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.util.task.TaskManager;
-import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.Template;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -101,7 +107,7 @@ public class SimpleBackupManager implements BackupManager {
             if (player != null) {
                 player.sendMessage(
                         TranslatableCaption.of("backups.backup_automatic_started"),
-                        TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
+                        Template.of("plot", plot.getId().toString())
                 );
             }
             profile.createBackup().whenComplete((backup, throwable) -> {
@@ -109,7 +115,7 @@ public class SimpleBackupManager implements BackupManager {
                     if (player != null) {
                         player.sendMessage(
                                 TranslatableCaption.of("backups.backup_automatic_failure"),
-                                TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
+                                Templates.of("reason", throwable.getMessage())
                         );
                     }
                     throwable.printStackTrace();

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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

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

@@ -1,7 +1,14 @@
 /*
- * PlotSquared, a land and world management plugin for Minecraft.
+ *       _____  _       _    _____                                _
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ *      |  __ \| |     | |  / ____|                              | |
- * Copyright (C) IntellectualSites team and contributors
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            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