port over alias :)

port claim :)
implement the command requirement logic
2025-07-30 19:15:27 +02:00 · 2023-05-13 16:53:56 +02:00 · 2023-03-09 06:34:15 +01:00 · 2023-03-04 12:57:14 +01:00 · 2023-03-04 07:51:10 +01:00 · 2023-03-02 06:33:16 +01:00
207 changed files with 3339 additions and 3436 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -7,8 +7,8 @@ body:
    attributes:
      value: |
        Thanks for taking the time to fill out this bug report for PlotSquared! Fill out the following form to your best ability to help us fix the problem.
-        Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://intellectualsites.gitbook.io/plotsquared/).
-        Do NOT use the public issue tracker to report security vulnerabilities! They are disclosed using [this](https://github.com/IntellectualSites/PlotSquared/security/policy) GitHub form!
+        Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://intellectualsites.github.io/plotsquared-documentation/).
+        Do NOT use the public issue tracker to report security vulnerabilities! They are disclosed using [this](https://forms.gle/btgdRn9yhGtzEiGW8) form!

  - type: dropdown
    attributes:
@@ -27,9 +27,6 @@ body:
      description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
      multiple: false
      options:
-        - '1.20.4'
-        - '1.20'
-        - '1.19.4'
        - '1.19.3'
        - '1.19.2'
        - '1.19.1'
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -4,5 +4,5 @@ contact_links:
    url: https://discord.gg/intellectualsites
    about: Our support Discord, please ask questions and seek support here.
  - name: PlotSquared Wiki
-    url: https://intellectualsites.gitbook.io/plotsquared/
+    url: https://intellectualsites.github.io/plotsquared-documentation/
    about: Take a look at the wiki page for instructions how to setup PlotSquared and use its commands.
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -7,7 +7,7 @@ body:
    attributes:
      value: |
        Thanks for taking the time to fill out this feature request for PlotSquared! Fill out the following form to your best ability to help us understand your feature request and greately improve the change of it getting added.
-        For anything else than a feature request, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://intellectualsites.gitbook.io/plotsquared/).
+        For anything else than a feature request, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://intellectualsites.github.io/plotsquared-documentation/).

  - type: textarea
    attributes:
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -1,19 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base",
-    ":semanticCommitsDisabled"
-  ],
-  "automerge": true,
-  "labels": [
-    "dependencies"
-  ],
-  "rebaseWhen": "conflicted",
-  "schedule": ["on the first day of the month"],
-  "ignoreDeps": [
-    "com.google.code.gson:gson",
-    "com.google.guava:guava",
-    "org.yaml:snakeyaml",
-    "org.apache.logging.log4j:log4j-api"
-  ]
-}
--- a/.github/workflows/announce-release-on-discord.yml
+++ b/.github/workflows/announce-release-on-discord.yml
@@ -1,7 +1,8 @@
 name: Announce release on discord
 on:
  release:
-    types: [ published ]
+    types: [published]
+
 jobs:
  send_announcement:
    runs-on: ubuntu-latest
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -1,5 +1,7 @@
 name: Build PR
+
 on: [ pull_request ]
+
 jobs:
  build_pr:
    if: github.repository_owner == 'IntellectualSites'
@@ -9,11 +11,11 @@ jobs:
        os: [ ubuntu-latest, windows-latest, macos-latest ]
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/wrapper-validation-action@v1
      - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
        with:
          distribution: temurin
          java-version: 17
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,19 +1,21 @@
 name: build
+
 on:
  push:
    branches:
-      - main
+      - v7
+
 jobs:
  build:
    if: github.repository_owner == 'IntellectualSites'
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/wrapper-validation-action@v1
      - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
        with:
          distribution: temurin
          java-version: 17
@@ -28,7 +30,7 @@ jobs:
            echo "STATUS=release" >> $GITHUB_ENV
          fi
      - name: Publish Release
-        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
+        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
        run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
        env:
          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
@@ -36,13 +38,14 @@ jobs:
          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
      - name: Publish Snapshot
-        if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7' }}
        run: ./gradlew publishToSonatype
        env:
          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
      - name: Publish core javadoc
-        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
+       # if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
+        if: ${{ runner.os == 'Linux' && env.STATUS == 'snapshot' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
        uses: cpina/github-action-push-to-another-repository@main
        env:
          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
@@ -54,7 +57,8 @@ jobs:
          target-branch: main
          target-directory: v7/core
      - name: Publish bukkit javadoc
-        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
+       # if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
+        if: ${{ runner.os == 'Linux' && env.STATUS == 'snapshot' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
        uses: cpina/github-action-push-to-another-repository@main
        env:
          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -1,10 +1,11 @@
 name: "CodeQL"
+
 on:
  push:
-    branches: [ main ]
+    branches: [ v7 ]
  pull_request:
    # The branches below must be a subset of the branches above
-    branches: [ main ]
+    branches: [ v7 ]

 jobs:
  analyze:
@@ -14,23 +15,23 @@ jobs:
      actions: read
      contents: read
      security-events: write
+
    strategy:
      fail-fast: false
      matrix:
        language: [ 'java' ]
+
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 17
+        uses: actions/checkout@v3
+
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v2
        with:
          languages: ${{ matrix.language }}
+
      - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v2
+
      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v2
--- a/.github/workflows/label-merge-conflicts.yaml
+++ b/.github/workflows/label-merge-conflicts.yaml
@@ -1,23 +0,0 @@
-name: "Label conflicting PRs"
-on:
-  push:
-  pull_request_target:
-    types: [ synchronize ]
-  pull_request:
-    types: [ synchronize ]
-
-permissions:
-  pull-requests: write
-
-jobs:
-  main:
-    if: github.event.pull_request.user.login != 'dependabot[bot]'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Label conflicting PRs
-        uses: eps1lon/actions-label-merge-conflict@v2.1.0
-        with:
-          dirtyLabel: "unresolved-merge-conflict"
-          repoToken: "${{ secrets.GITHUB_TOKEN }}"
-          commentOnDirty: "Please take a moment and address the merge conflicts of your pull request. Thanks!"
-          continueOnMissingPermissions: true
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -1,17 +1,19 @@
 name: draft release
+
 on:
  push:
    branches:
-      - main
+      - v6
  pull_request:
    types: [ opened, reopened, synchronize ]
  pull_request_target:
    types: [ opened, reopened, synchronize ]
+
 jobs:
  update_release_draft:
    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
    runs-on: ubuntu-latest
    steps:
-      - uses: release-drafter/release-drafter@v6
+      - uses: release-drafter/release-drafter@v5
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@@ -137,6 +137,3 @@ docs/
 build/

 .DS_Store
-# Ignore run folders
-run-[0-9].[0-9][0-9]/
-run-[0-9].[0-9][0-9].[0-9]/
--- a/.idea/icon.svg
+++ b/.idea/icon.svg
@@ -1,144 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   id="svg2"
-   xml:space="preserve"
-   width="512"
-   height="512"
-   viewBox="0 0 512 512.00001"
-   sodipodi:docname="icon.svg"
-   inkscape:version="1.1.2 (b8e25be8, 2022-02-05)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-		<metadata
-   id="metadata8">
+<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="">
+				<cc:Work rdf:about="">
 					<dc:format>image/svg+xml</dc:format>
-                    <dc:type
-   rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+                    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
 				</cc:Work>
 			</rdf:RDF>
 		</metadata>
-    <defs
-   id="defs6">
-			<clipPath
-   clipPathUnits="userSpaceOnUse"
-   id="clipPath18">
-				<path
-   d="M 0,2500 H 3000 V 0 H 0 Z"
-   id="path16" />
+    <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="1440"
-   inkscape:window-height="900"
-   id="namedview4"
-   inkscape:pagecheckerboard="0"
-   showgrid="false"
-   inkscape:zoom="0.1632"
-   inkscape:cx="1087.6225"
-   inkscape:cy="1666.6666"
-   inkscape:window-x="0"
-   inkscape:window-y="0"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="g10" />
-    <g
-   id="g10"
-   inkscape:groupmode="layer"
-   inkscape:label="PlotSquared"
-   transform="matrix(1.3333333,0,0,-1.3333333,0,3333.3333)">
-			<g
-   id="g12"
-   transform="matrix(0.16955078,0,0,0.16955078,-68.456969,2101.8529)">
-				<g
-   id="g14"
-   clip-path="url(#clipPath18)">
-					<g
-   id="g20"
-   transform="translate(1486.1511,2242.6453)">
-						<path
-   d="m 0,0 c 16.533,10.846 33.211,21.453 50.104,31.699 78.972,-48.281 153.985,-102.704 227.269,-159.144 148.61,-115.422 287.884,-243.01 414.393,-382.333 111.39,-122.861 212.751,-255.152 298.898,-396.971 52.744,-87.322 100.544,-177.884 139.514,-272.214 -11.638,-3.551 -23.108,-7.655 -34.362,-12.286 l -0.24,0.288 c -11.135,12.982 -24.141,24.212 -34.915,37.506 -22.557,23.013 -45.425,45.737 -68.03,68.678 -19.725,20.253 -40.601,39.45 -58.958,60.974 -36.355,36.451 -72.517,73.093 -108.944,109.471 -22.628,26.013 -48.064,49.385 -71.965,74.197 -19.029,19.485 -38.706,38.346 -57.519,57.999 -12.166,14.998 -26.684,27.716 -39.93,41.658 -27.668,27.524 -54.903,55.479 -82.571,82.979 -23.924,27.956 -51.664,52.264 -76.692,79.164 -4.68,4.487 -8.855,10.774 -15.886,11.326 -22.34,34.027 -58.311,57.327 -97.377,67.502 -104.312,99.153 -215.487,191.202 -332.661,274.782 -117.942,-83.94 -229.476,-176.781 -334.484,-276.39 -26.684,-0.024 -53.368,0.024 -80.076,-0.024 0.024,-26.564 0.048,-53.104 0,-79.668 -72.229,-73.021 -139.491,-150.937 -202.385,-232.092 -63.758,-82.619 -121.973,-169.51 -173.541,-260.264 131.932,-69.061 257.864,-149.521 375.926,-240.275 0.096,-26.444 -0.12,-52.888 0.096,-79.332 l 0.744,-0.984 c 20.109,-24.14 43.409,-45.233 65.126,-67.861 15.118,-15.382 30.571,-30.404 45.569,-45.881 17.565,-20.733 37.698,-39.042 56.607,-58.503 19.917,-20.781 41.25,-40.218 59.967,-62.151 29.156,-29.299 58.167,-58.815 87.515,-87.922 29.155,-33.043 61.502,-63.111 92.169,-94.738 13.726,-12.67 25.124,-27.571 38.634,-40.457 25.029,-25.365 50.129,-50.657 75.325,-75.853 -37.914,-51.208 -73.741,-103.952 -107.192,-158.183 -167.83,273.317 -397.235,507.305 -662.37,687.158 -81.875,55.335 -167.23,105.584 -255.681,149.641 -52.815,26.276 -106.831,50.248 -162.239,70.381 99.393,233.628 242.795,446.715 410.289,636.79 93.562,106.088 194.634,205.433 301.466,298.13 C -217.335,-155.808 -111.439,-73.789 0,0"
-   style="fill:#062f4c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-   id="path22" />
+    <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 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 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 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 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 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 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 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 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>
--- a/Bukkit/build.gradle.kts
+++ b/Bukkit/build.gradle.kts
@@ -18,23 +18,23 @@ repositories {
 }

 dependencies {
-    api(projects.plotsquaredCore)
+    api(projects.plotSquaredCore)

    // Metrics
-    implementation(libs.bstatsBukkit)
+    implementation("org.bstats:bstats-bukkit")

    // Paper
-    compileOnly(libs.paper)
-    implementation(libs.paperlib)
+    compileOnly("io.papermc.paper:paper-api")
+    implementation("io.papermc:paperlib")

    // Plugins
    compileOnly(libs.worldeditBukkit) {
        exclude(group = "org.bukkit")
        exclude(group = "org.spigotmc")
    }
-    compileOnly(libs.faweBukkit) { isTransitive = false }
-    testImplementation(libs.faweBukkit) { isTransitive = false }
-    compileOnly(libs.vault) {
+    compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit") { isTransitive = false }
+    testImplementation("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit") { isTransitive = false }
+    compileOnly("com.github.MilkBowl:VaultAPI") {
        exclude(group = "org.bukkit")
    }
    compileOnly(libs.placeholderapi)
@@ -44,15 +44,19 @@ dependencies {

    // Other libraries
    implementation(libs.squirrelid) { isTransitive = false }
-    implementation(libs.serverlib)
+    implementation("dev.notmyfault.serverlib:ServerLib")

    // Our libraries
    implementation(libs.arkitektonika)
-    implementation(libs.paster)
-    implementation(libs.informativeAnnotations)
+    implementation("com.intellectualsites.paster:Paster")
+    implementation("com.intellectualsites.informative-annotations:informative-annotations")

    // Adventure
-    implementation(libs.adventureBukkit)
+    implementation("net.kyori:adventure-platform-bukkit")
+
+    // Cloud
+    implementation(libs.cloudPaper)
+    implementation(libs.cloudMinecraftExtras)
 }

 tasks.processResources {
@@ -62,12 +66,10 @@ tasks.processResources {
 }

 tasks.named<ShadowJar>("shadowJar") {
-    dependsOn(":plotsquared-core:shadowJar")
    dependencies {
        exclude(dependency("org.checkerframework:"))
    }

-    relocate("net.kyori.option", "com.plotsquared.core.configuration.option")
    relocate("net.kyori.adventure", "com.plotsquared.core.configuration.adventure")
    relocate("net.kyori.examination", "com.plotsquared.core.configuration.examination")
    relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")
@@ -101,12 +103,12 @@ tasks {
    withType<Javadoc> {
        val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
        val opt = options as StandardJavadocDocletOptions
-        opt.links("https://jd.papermc.io/paper/1.20/")
+        opt.links("https://jd.papermc.io/paper/1.19/")
        opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
        opt.links("https://intellectualsites.github.io/plotsquared-javadocs/core/")
-        opt.links("https://jd.advntr.dev/api/4.14.0/")
+        opt.links("https://jd.adventure.kyori.net/api/4.12.0/")
        opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
-    //    opt.links("https://checkerframework.org/api/")
+        opt.links("https://checkerframework.org/api/")
        opt.isLinkSource = true
        opt.bottom(File("$rootDir/javadocfooter.html").readText())
        opt.isUse = true
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
@@ -37,7 +37,6 @@ import com.plotsquared.bukkit.listener.EntityEventListener;
 import com.plotsquared.bukkit.listener.EntitySpawnListener;
 import com.plotsquared.bukkit.listener.PaperListener;
 import com.plotsquared.bukkit.listener.PlayerEventListener;
-import com.plotsquared.bukkit.listener.PlayerEventListener1201;
 import com.plotsquared.bukkit.listener.ProjectileEventListener;
 import com.plotsquared.bukkit.listener.ServerListener;
 import com.plotsquared.bukkit.listener.SingleWorldListener;
@@ -50,8 +49,8 @@ import com.plotsquared.bukkit.player.BukkitPlayerManager;
 import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.bukkit.util.BukkitWorld;
 import com.plotsquared.bukkit.util.SetGenCB;
-import com.plotsquared.bukkit.util.TranslationUpdateManager;
 import com.plotsquared.bukkit.util.UpdateUtility;
+import com.plotsquared.bukkit.util.TranslationUpdateManager;
 import com.plotsquared.bukkit.util.task.BukkitTaskManager;
 import com.plotsquared.bukkit.util.task.PaperTimeConverter;
 import com.plotsquared.bukkit.util.task.SpigotTimeConverter;
@@ -64,6 +63,7 @@ import com.plotsquared.bukkit.uuid.SquirrelIdUUIDService;
 import com.plotsquared.core.PlotPlatform;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.backup.BackupManager;
+import com.plotsquared.core.commands.PlotSquaredCommandManager;
 import com.plotsquared.core.components.ComponentPresetManager;
 import com.plotsquared.core.configuration.ConfigurationNode;
 import com.plotsquared.core.configuration.ConfigurationSection;
@@ -136,7 +136,6 @@ import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -217,6 +216,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
    @Inject
    private PlatformWorldManager<World> worldManager;
    private Locale serverLocale;
+    @Inject
+    private PlotSquaredCommandManager commandManager;

    @SuppressWarnings("StringSplitter")
    @Override
@@ -254,7 +255,6 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
    }

    @Override
-    @SuppressWarnings("deprecation") // Paper deprecation
    public void onEnable() {
        this.pluginName = getDescription().getName();

@@ -360,9 +360,6 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl

        if (Settings.Enabled_Components.EVENTS) {
            getServer().getPluginManager().registerEvents(injector().getInstance(PlayerEventListener.class), this);
-            if ((serverVersion()[1] == 20 && serverVersion()[2] >= 1) || serverVersion()[1] > 20) {
-                getServer().getPluginManager().registerEvents(injector().getInstance(PlayerEventListener1201.class), this);
-            }
            getServer().getPluginManager().registerEvents(injector().getInstance(BlockEventListener.class), this);
            if (serverVersion()[1] >= 17) {
                getServer().getPluginManager().registerEvents(injector().getInstance(BlockEventListener117.class), this);
@@ -372,7 +369,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
            getServer().getPluginManager().registerEvents(injector().getInstance(ServerListener.class), this);
            getServer().getPluginManager().registerEvents(injector().getInstance(EntitySpawnListener.class), this);
            if (PaperLib.isPaper() && Settings.Paper_Components.PAPER_LISTENERS) {
-                getServer().getPluginManager().registerEvents(injector().getInstance(PaperListener.class), this);
+                    getServer().getPluginManager().registerEvents(injector().getInstance(PaperListener.class), this);
            } else {
                getServer().getPluginManager().registerEvents(injector().getInstance(SpigotListener.class), this);
            }
@@ -388,6 +385,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
        // Commands
        if (Settings.Enabled_Components.COMMANDS) {
            this.registerCommands();
+            this.commandManager.initializeCommands();
        }

        // Permissions
@@ -556,7 +554,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
        this.startMetrics();

        if (Settings.Enabled_Components.WORLDS) {
-            TaskManager.getPlatformImplementation().taskRepeat(this::unload, TaskTime.seconds(10L));
+            TaskManager.getPlatformImplementation().taskRepeat(this::unload, TaskTime.seconds(1L));
            try {
                singleWorldListener = injector().getInstance(SingleWorldListener.class);
                Bukkit.getPluginManager().registerEvents(singleWorldListener, this);
@@ -779,13 +777,6 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                Iterator<Entity> iterator = entities.iterator();
                while (iterator.hasNext()) {
                    Entity entity = iterator.next();
-                    if (PaperLib.isPaper() && "CUSTOM".equals(entity.getEntitySpawnReason().name())) {
-                        continue;
-                    }
-                    // Fallback for Spigot not having Entity#getEntitySpawnReason
-                    if (entity.getMetadata("ps_custom_spawned").stream().anyMatch(MetadataValue::asBoolean)) {
-                        continue;
-                    }
                    switch (entity.getType().toString()) {
                        case "EGG":
                        case "FISHING_HOOK":
@@ -825,7 +816,6 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                        case "MINECART_MOB_SPAWNER":
                        case "ENDER_CRYSTAL":
                        case "MINECART_TNT":
-                        case "CHEST_BOAT":
                        case "BOAT":
                            if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
                                com.plotsquared.core.location.Location location = BukkitUtil.adapt(entity.getLocation());
@@ -874,7 +864,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                    if (livingEntity.isLeashed() && !Settings.Enabled_Components.KILL_OWNED_ROAD_MOBS) {
                                        continue;
                                    }
-                                    if (entity.hasMetadata("keep")) {
+                                    List<MetadataValue> keep = entity.getMetadata("keep");
+                                    if (!keep.isEmpty()) {
                                        continue;
                                    }

@@ -1173,7 +1164,6 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
        return new BukkitPlotGenerator(world, generator, this.plotAreaManager);
    }

-    @SuppressWarnings("deprecation") // Paper deprecation
    @Override
    public @NonNull String pluginsFormatted() {
        StringBuilder msg = new StringBuilder();
@@ -1190,37 +1180,18 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                    .append("  • Load Before: ").append(p.getDescription().getLoadBefore()).append("\n")
                    .append("  • Dependencies: ").append(p.getDescription().getDepend()).append("\n")
                    .append("  • Soft Dependencies: ").append(p.getDescription().getSoftDepend()).append("\n");
-            List<RegisteredServiceProvider<?>> providers = Bukkit.getServicesManager().getRegistrations(p);
-            if (!providers.isEmpty()) {
-                msg.append("  • Provided Services: \n");
-                for (RegisteredServiceProvider<?> provider : providers) {
-                    msg.append("    • ")
-                            .append(provider.getService().getName()).append(" = ")
-                            .append(provider.getProvider().getClass().getName())
-                            .append(" (priority: ").append(provider.getPriority()).append(")")
-                            .append("\n");
-                }
-            }
        }
        return msg.toString();
    }

    @Override
-    @SuppressWarnings({"ConstantConditions", "deprecation"}) // Paper deprecation
+    @SuppressWarnings("ConstantConditions")
    public @NonNull String worldEditImplementations() {
        StringBuilder msg = new StringBuilder();
        if (Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit") != null) {
-            msg.append("FastAsyncWorldEdit: ").append(Bukkit
-                    .getPluginManager()
-                    .getPlugin("FastAsyncWorldEdit")
-                    .getDescription()
-                    .getVersion());
+            msg.append("FastAsyncWorldEdit: ").append(Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit").getDescription().getVersion());
        } else if (Bukkit.getPluginManager().getPlugin("AsyncWorldEdit") != null) {
-            msg.append("AsyncWorldEdit: ").append(Bukkit
-                    .getPluginManager()
-                    .getPlugin("AsyncWorldEdit")
-                    .getDescription()
-                    .getVersion()).append("\n");
+            msg.append("AsyncWorldEdit: ").append(Bukkit.getPluginManager().getPlugin("AsyncWorldEdit").getDescription().getVersion()).append("\n");
            msg.append("WorldEdit: ").append(Bukkit.getPluginManager().getPlugin("WorldEdit").getDescription().getVersion());
        } else {
            msg.append("WorldEdit: ").append(Bukkit.getPluginManager().getPlugin("WorldEdit").getDescription().getVersion());
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java
@@ -33,7 +33,6 @@ import org.bukkit.entity.Ageable;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Bat;
 import org.bukkit.entity.Boat;
-import org.bukkit.entity.Breedable;
 import org.bukkit.entity.ChestedHorse;
 import org.bukkit.entity.EnderDragon;
 import org.bukkit.entity.Entity;
@@ -75,7 +74,6 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
    private HorseStats horse;
    private boolean noGravity;

-    @SuppressWarnings("deprecation") // Deprecation exists since 1.20, while we support 1.16 onwards
    public ReplicatingEntityWrapper(Entity entity, short depth) {
        super(entity);

@@ -103,26 +101,50 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
            this.noGravity = true;
        }
        switch (entity.getType().toString()) {
-            case "BOAT" -> {
+            case "BOAT":
                Boat boat = (Boat) entity;
                this.dataByte = getOrdinal(TreeSpecies.values(), boat.getWoodType());
                return;
-            }
-            case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "EXPERIENCE_ORB", "FALLING_BLOCK", "FIREBALL",
-                    "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND", "MINECART_MOB_SPAWNER",
-                    "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SLIME", "SMALL_FIREBALL", "SNOWBALL", "MINECART_FURNACE", "SPLASH_POTION",
-                    "THROWN_EXP_BOTTLE", "WITHER_SKULL", "UNKNOWN", "SPECTRAL_ARROW", "SHULKER_BULLET", "DRAGON_FIREBALL", "AREA_EFFECT_CLOUD",
-                    "TRIDENT", "LLAMA_SPIT" -> {
+            case "ARROW":
+            case "EGG":
+            case "ENDER_CRYSTAL":
+            case "ENDER_PEARL":
+            case "ENDER_SIGNAL":
+            case "EXPERIENCE_ORB":
+            case "FALLING_BLOCK":
+            case "FIREBALL":
+            case "FIREWORK":
+            case "FISHING_HOOK":
+            case "LEASH_HITCH":
+            case "LIGHTNING":
+            case "MINECART":
+            case "MINECART_COMMAND":
+            case "MINECART_MOB_SPAWNER":
+            case "MINECART_TNT":
+            case "PLAYER":
+            case "PRIMED_TNT":
+            case "SLIME":
+            case "SMALL_FIREBALL":
+            case "SNOWBALL":
+            case "MINECART_FURNACE":
+            case "SPLASH_POTION":
+            case "THROWN_EXP_BOTTLE":
+            case "WITHER_SKULL":
+            case "UNKNOWN":
+            case "SPECTRAL_ARROW":
+            case "SHULKER_BULLET":
+            case "DRAGON_FIREBALL":
+            case "AREA_EFFECT_CLOUD":
+            case "TRIDENT":
+            case "LLAMA_SPIT":
                // Do this stuff later
                return;
-            }
            // MISC //
-            case "DROPPED_ITEM" -> {
+            case "DROPPED_ITEM":
                Item item = (Item) entity;
                this.stack = item.getItemStack();
                return;
-            }
-            case "ITEM_FRAME" -> {
+            case "ITEM_FRAME":
                this.x = Math.floor(this.getX());
                this.y = Math.floor(this.getY());
                this.z = Math.floor(this.getZ());
@@ -130,8 +152,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                this.dataByte = getOrdinal(Rotation.values(), itemFrame.getRotation());
                this.stack = itemFrame.getItem().clone();
                return;
-            }
-            case "PAINTING" -> {
+            case "PAINTING":
                this.x = Math.floor(this.getX());
                this.y = Math.floor(this.getY());
                this.z = Math.floor(this.getZ());
@@ -144,17 +165,20 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                }
                this.dataString = art.name();
                return;
-            }
            // END MISC //
            // INVENTORY HOLDER //
-            case "MINECART_CHEST", "MINECART_HOPPER" -> {
+            case "MINECART_CHEST":
+            case "MINECART_HOPPER":
                storeInventory((InventoryHolder) entity);
                return;
-            }
            // START LIVING ENTITY //
            // START AGEABLE //
            // START TAMEABLE //
-            case "HORSE", "DONKEY", "LLAMA", "MULE", "SKELETON_HORSE" -> {
+            case "HORSE":
+            case "DONKEY":
+            case "LLAMA":
+            case "MULE":
+            case "SKELETON_HORSE":
                AbstractHorse horse = (AbstractHorse) entity;
                this.horse = new HorseStats();
                this.horse.jump = horse.getJumpStrength();
@@ -166,21 +190,20 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                //this.horse.style = horse.getStyle();
                //this.horse.color = horse.getColor();
                storeTameable(horse);
-                storeBreedable(horse);
+                storeAgeable(horse);
                storeLiving(horse);
                storeInventory(horse);
                return;
-            }
            // END INVENTORY HOLDER //
-            case "WOLF", "OCELOT" -> {
+            case "WOLF":
+            case "OCELOT":
                storeTameable((Tameable) entity);
-                storeBreedable((Breedable) entity);
+                storeAgeable((Ageable) entity);
                storeLiving((LivingEntity) entity);
                return;
-            }
            // END TAMEABLE //
            //todo fix sheep
-            case "SHEEP" -> {
+            case "SHEEP":
                Sheep sheep = (Sheep) entity;
                if (sheep.isSheared()) {
                    this.dataByte = (byte) 1;
@@ -188,23 +211,26 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                    this.dataByte = (byte) 0;
                }
                this.dataByte2 = sheep.getColor().getDyeData();
-                storeBreedable(sheep);
+                storeAgeable(sheep);
                storeLiving(sheep);
                return;
-            }
-            case "VILLAGER", "CHICKEN", "COW", "MUSHROOM_COW", "PIG", "TURTLE", "POLAR_BEAR" -> {
-                storeBreedable((Breedable) entity);
+            case "VILLAGER":
+            case "CHICKEN":
+            case "COW":
+            case "MUSHROOM_COW":
+            case "PIG":
+            case "TURTLE":
+            case "POLAR_BEAR":
+                storeAgeable((Ageable) entity);
                storeLiving((LivingEntity) entity);
                return;
-            }
-            case "RABBIT" -> {
+            case "RABBIT":
                this.dataByte = getOrdinal(Rabbit.Type.values(), ((Rabbit) entity).getRabbitType());
-                storeBreedable((Breedable) entity);
+                storeAgeable((Ageable) entity);
                storeLiving((LivingEntity) entity);
                return;
-            }
            // END AGEABLE //
-            case "ARMOR_STAND" -> {
+            case "ARMOR_STAND":
                ArmorStand stand = (ArmorStand) entity;
                this.inventory =
                        new ItemStack[]{stand.getItemInHand().clone(), stand.getHelmet().clone(),
@@ -212,30 +238,37 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                                stand.getBoots().clone()};
                storeLiving(stand);
                this.stand = new ArmorStandStats();
+
                EulerAngle head = stand.getHeadPose();
                this.stand.head[0] = (float) head.getX();
                this.stand.head[1] = (float) head.getY();
                this.stand.head[2] = (float) head.getZ();
+
                EulerAngle body = stand.getBodyPose();
                this.stand.body[0] = (float) body.getX();
                this.stand.body[1] = (float) body.getY();
                this.stand.body[2] = (float) body.getZ();
+
                EulerAngle leftLeg = stand.getLeftLegPose();
                this.stand.leftLeg[0] = (float) leftLeg.getX();
                this.stand.leftLeg[1] = (float) leftLeg.getY();
                this.stand.leftLeg[2] = (float) leftLeg.getZ();
+
                EulerAngle rightLeg = stand.getRightLegPose();
                this.stand.rightLeg[0] = (float) rightLeg.getX();
                this.stand.rightLeg[1] = (float) rightLeg.getY();
                this.stand.rightLeg[2] = (float) rightLeg.getZ();
+
                EulerAngle leftArm = stand.getLeftArmPose();
                this.stand.leftArm[0] = (float) leftArm.getX();
                this.stand.leftArm[1] = (float) leftArm.getY();
                this.stand.leftArm[2] = (float) leftArm.getZ();
+
                EulerAngle rightArm = stand.getRightArmPose();
                this.stand.rightArm[0] = (float) rightArm.getX();
                this.stand.rightArm[1] = (float) rightArm.getY();
                this.stand.rightArm[2] = (float) rightArm.getZ();
+
                if (stand.hasArms()) {
                    this.stand.arms = true;
                }
@@ -249,38 +282,53 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                    this.stand.small = true;
                }
                return;
-            }
-            case "ENDERMITE" -> {
+            case "ENDERMITE":
                return;
-            }
-            case "BAT" -> {
+            case "BAT":
                if (((Bat) entity).isAwake()) {
                    this.dataByte = (byte) 1;
                } else {
                    this.dataByte = (byte) 0;
                }
                return;
-            }
-            case "ENDER_DRAGON" -> {
+            case "ENDER_DRAGON":
                EnderDragon entity1 = (EnderDragon) entity;
                this.dataByte = (byte) entity1.getPhase().ordinal();
                return;
-            }
-            case "SKELETON", "WITHER_SKELETON", "GUARDIAN", "ELDER_GUARDIAN", "GHAST", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN",
-                    "ZOMBIFIED_PIGLIN", "PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH",
-                    "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SHULKER", "SNOWMAN" -> {
+            case "SKELETON":
+            case "WITHER_SKELETON":
+            case "GUARDIAN":
+            case "ELDER_GUARDIAN":
+            case "GHAST":
+            case "MAGMA_CUBE":
+            case "SQUID":
+            case "PIG_ZOMBIE":
+            case "HOGLIN":
+            case "ZOMBIFIED_PIGLIN":
+            case "PIGLIN":
+            case "PIGLIN_BRUTE":
+            case "ZOMBIE":
+            case "WITHER":
+            case "WITCH":
+            case "SPIDER":
+            case "CAVE_SPIDER":
+            case "SILVERFISH":
+            case "GIANT":
+            case "ENDERMAN":
+            case "CREEPER":
+            case "BLAZE":
+            case "SHULKER":
+            case "SNOWMAN":
                storeLiving((LivingEntity) entity);
                return;
-            }
-            case "IRON_GOLEM" -> {
+            case "IRON_GOLEM":
                if (((IronGolem) entity).isPlayerCreated()) {
                    this.dataByte = (byte) 1;
                } else {
                    this.dataByte = (byte) 0;
                }
                storeLiving((LivingEntity) entity);
-            }
-            // END LIVING //
+                // END LIVING //
        }
    }

@@ -383,11 +431,6 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
        }
    }

-    /**
-     * @deprecated Use {@link #restoreBreedable(Breedable)} instead
-     * @since 7.1.0
-     */
-    @Deprecated(forRemoval = true, since = "7.1.0")
    private void restoreAgeable(Ageable entity) {
        if (!this.aged.adult) {
            entity.setBaby();
@@ -398,11 +441,6 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
        }
    }

-    /**
-     * @deprecated Use {@link #storeBreedable(Breedable)} instead
-     * @since 7.1.0
-     */
-    @Deprecated(forRemoval = true, since = "7.1.0")
    public void storeAgeable(Ageable aged) {
        this.aged = new AgeableStats();
        this.aged.age = aged.getAge();
@@ -410,29 +448,6 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
        this.aged.adult = aged.isAdult();
    }

-    /**
-     * @since 7.1.0
-     */
-    private void restoreBreedable(Breedable entity) {
-        if (!this.aged.adult) {
-            entity.setBaby();
-        }
-        entity.setAgeLock(this.aged.locked);
-        if (this.aged.age > 0) {
-            entity.setAge(this.aged.age);
-        }
-    }
-
-    /**
-     * @since 7.1.0
-     */
-    private void storeBreedable(Breedable breedable) {
-        this.aged = new AgeableStats();
-        this.aged.age = breedable.getAge();
-        this.aged.locked = breedable.getAgeLock();
-        this.aged.adult = breedable.isAdult();
-    }
-
    public void storeTameable(Tameable tamed) {
        this.tamed = new TameableStats();
        this.tamed.owner = tamed.getOwner();
@@ -450,15 +465,20 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
        }
        Entity entity;
        switch (this.getType().toString()) {
-            case "DROPPED_ITEM" -> {
+            case "DROPPED_ITEM":
                return world.dropItem(location, this.stack);
-            }
-            case "PLAYER", "LEASH_HITCH" -> {
+            case "PLAYER":
+            case "LEASH_HITCH":
                return null;
-            }
-            case "ITEM_FRAME" -> entity = world.spawn(location, ItemFrame.class);
-            case "PAINTING" -> entity = world.spawn(location, Painting.class);
-            default -> entity = world.spawnEntity(location, this.getType());
+            case "ITEM_FRAME":
+                entity = world.spawn(location, ItemFrame.class);
+                break;
+            case "PAINTING":
+                entity = world.spawn(location, Painting.class);
+                break;
+            default:
+                entity = world.spawnEntity(location, this.getType());
+                break;
        }
        if (this.depth == 0) {
            return entity;
@@ -486,46 +506,72 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
            entity.setGravity(false);
        }
        switch (entity.getType().toString()) {
-            case "BOAT" -> {
+            case "BOAT":
                Boat boat = (Boat) entity;
                boat.setWoodType(TreeSpecies.values()[dataByte]);
                return entity;
-            }
-            case "SLIME" -> {
+            case "SLIME":
                ((Slime) entity).setSize(this.dataByte);
                return entity;
-            }
-            case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "DROPPED_ITEM", "EXPERIENCE_ORB", "FALLING_BLOCK",
-                    "FIREBALL", "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND",
-                    "MINECART_MOB_SPAWNER", "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SMALL_FIREBALL", "SNOWBALL",
-                    "SPLASH_POTION", "THROWN_EXP_BOTTLE", "SPECTRAL_ARROW", "SHULKER_BULLET", "AREA_EFFECT_CLOUD",
-                    "DRAGON_FIREBALL", "WITHER_SKULL", "MINECART_FURNACE", "LLAMA_SPIT", "TRIDENT", "UNKNOWN" -> {
+            case "ARROW":
+            case "EGG":
+            case "ENDER_CRYSTAL":
+            case "ENDER_PEARL":
+            case "ENDER_SIGNAL":
+            case "DROPPED_ITEM":
+            case "EXPERIENCE_ORB":
+            case "FALLING_BLOCK":
+            case "FIREBALL":
+            case "FIREWORK":
+            case "FISHING_HOOK":
+            case "LEASH_HITCH":
+            case "LIGHTNING":
+            case "MINECART":
+            case "MINECART_COMMAND":
+            case "MINECART_MOB_SPAWNER":
+            case "MINECART_TNT":
+            case "PLAYER":
+            case "PRIMED_TNT":
+            case "SMALL_FIREBALL":
+            case "SNOWBALL":
+            case "SPLASH_POTION":
+            case "THROWN_EXP_BOTTLE":
+            case "SPECTRAL_ARROW":
+            case "SHULKER_BULLET":
+            case "AREA_EFFECT_CLOUD":
+            case "DRAGON_FIREBALL":
+            case "WITHER_SKULL":
+            case "MINECART_FURNACE":
+            case "LLAMA_SPIT":
+            case "TRIDENT":
+            case "UNKNOWN":
                // Do this stuff later
                return entity;
-            }
            // MISC //
-            case "ITEM_FRAME" -> {
+            case "ITEM_FRAME":
                ItemFrame itemframe = (ItemFrame) entity;
                itemframe.setRotation(Rotation.values()[this.dataByte]);
                itemframe.setItem(this.stack);
                return entity;
-            }
-            case "PAINTING" -> {
+            case "PAINTING":
                Painting painting = (Painting) entity;
                painting.setFacingDirection(BlockFace.values()[this.dataByte], true);
                painting.setArt(Art.getByName(this.dataString), true);
                return entity;
-            }
            // END MISC //
            // INVENTORY HOLDER //
-            case "MINECART_CHEST", "MINECART_HOPPER" -> {
+            case "MINECART_CHEST":
+            case "MINECART_HOPPER":
                restoreInventory((InventoryHolder) entity);
                return entity;
-            }
            // START LIVING ENTITY //
            // START AGEABLE //
            // START TAMEABLE //
-            case "HORSE", "LLAMA", "SKELETON_HORSE", "DONKEY", "MULE" -> {
+            case "HORSE":
+            case "LLAMA":
+            case "SKELETON_HORSE":
+            case "DONKEY":
+            case "MULE":
                AbstractHorse horse = (AbstractHorse) entity;
                horse.setJumpStrength(this.horse.jump);
                if (horse instanceof ChestedHorse) {
@@ -536,20 +582,19 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                //horse.setStyle(this.horse.style);
                //horse.setColor(this.horse.color);
                restoreTameable(horse);
-                restoreBreedable(horse);
+                restoreAgeable(horse);
                restoreLiving(horse);
                restoreInventory(horse);
                return entity;
-            }
            // END INVENTORY HOLDER //
-            case "WOLF", "OCELOT" -> {
+            case "WOLF":
+            case "OCELOT":
                restoreTameable((Tameable) entity);
-                restoreBreedable((Breedable) entity);
+                restoreAgeable((Ageable) entity);
                restoreLiving((LivingEntity) entity);
                return entity;
-            }
            // END AGEABLE //
-            case "SHEEP" -> {
+            case "SHEEP":
                Sheep sheep = (Sheep) entity;
                if (this.dataByte == 1) {
                    sheep.setSheared(true);
@@ -557,25 +602,28 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                if (this.dataByte2 != 0) {
                    sheep.setColor(DyeColor.getByDyeData(this.dataByte2));
                }
-                restoreBreedable(sheep);
+                restoreAgeable(sheep);
                restoreLiving(sheep);
                return sheep;
-            }
-            case "VILLAGER", "CHICKEN", "COW", "TURTLE", "POLAR_BEAR", "MUSHROOM_COW", "PIG" -> {
-                restoreBreedable((Breedable) entity);
+            case "VILLAGER":
+            case "CHICKEN":
+            case "COW":
+            case "TURTLE":
+            case "POLAR_BEAR":
+            case "MUSHROOM_COW":
+            case "PIG":
+                restoreAgeable((Ageable) entity);
                restoreLiving((LivingEntity) entity);
                return entity;
-            }
            // END AGEABLE //
-            case "RABBIT" -> {
+            case "RABBIT":
                if (this.dataByte != 0) {
                    ((Rabbit) entity).setRabbitType(Rabbit.Type.values()[this.dataByte]);
                }
-                restoreBreedable((Breedable) entity);
+                restoreAgeable((Ageable) entity);
                restoreLiving((LivingEntity) entity);
                return entity;
-            }
-            case "ARMOR_STAND" -> {
+            case "ARMOR_STAND":
                // CHECK positions
                ArmorStand stand = (ArmorStand) entity;
                if (this.inventory[0] != null) {
@@ -645,38 +693,56 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                }
                restoreLiving(stand);
                return stand;
-            }
-            case "BAT" -> {
+            case "BAT":
                if (this.dataByte != 0) {
                    ((Bat) entity).setAwake(true);
                }
                restoreLiving((LivingEntity) entity);
                return entity;
-            }
-            case "ENDER_DRAGON" -> {
+            case "ENDER_DRAGON":
                if (this.dataByte != 0) {
                    ((EnderDragon) entity).setPhase(EnderDragon.Phase.values()[this.dataByte]);
                }
                restoreLiving((LivingEntity) entity);
                return entity;
-            }
-            case "ENDERMITE", "GHAST", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN", "PIGLIN", "ZOMBIFIED_PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH", "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SNOWMAN", "SHULKER", "GUARDIAN", "ELDER_GUARDIAN", "SKELETON", "WITHER_SKELETON" -> {
+            case "ENDERMITE":
+            case "GHAST":
+            case "MAGMA_CUBE":
+            case "SQUID":
+            case "PIG_ZOMBIE":
+            case "HOGLIN":
+            case "PIGLIN":
+            case "ZOMBIFIED_PIGLIN":
+            case "PIGLIN_BRUTE":
+            case "ZOMBIE":
+            case "WITHER":
+            case "WITCH":
+            case "SPIDER":
+            case "CAVE_SPIDER":
+            case "SILVERFISH":
+            case "GIANT":
+            case "ENDERMAN":
+            case "CREEPER":
+            case "BLAZE":
+            case "SNOWMAN":
+            case "SHULKER":
+            case "GUARDIAN":
+            case "ELDER_GUARDIAN":
+            case "SKELETON":
+            case "WITHER_SKELETON":
                restoreLiving((LivingEntity) entity);
                return entity;
-            }
-            case "IRON_GOLEM" -> {
+            case "IRON_GOLEM":
                if (this.dataByte != 0) {
                    ((IronGolem) entity).setPlayerCreated(true);
                }
                restoreLiving((LivingEntity) entity);
                return entity;
-            }
-            default -> {
+            default:
                if (Settings.DEBUG) {
                    LOGGER.info("Could not identify entity: {}", entity.getType());
                }
                return entity;
-            }
            // END LIVING
        }
    }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
@@ -34,12 +34,9 @@ import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
 import com.plotsquared.core.util.ChunkManager;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.math.BlockVector2;
-import com.sk89q.worldedit.math.BlockVector3;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.bukkit.HeightMap;
-import org.bukkit.NamespacedKey;
-import org.bukkit.Registry;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.generator.BiomeProvider;
@@ -51,17 +48,13 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Random;
 import java.util.Set;

-import static java.util.function.Predicate.not;
-
 public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrapper<ChunkGenerator> {

-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitPlotGenerator.class.getSimpleName());
+    private static final Logger LOGGER =  LogManager.getLogger("PlotSquared/" + BukkitPlotGenerator.class.getSimpleName());

    @SuppressWarnings("unused")
    public final boolean PAPER_ASYNC_SAFE = true;
@@ -192,6 +185,12 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
        world.setWaterAnimalSpawnLimit(limit);
    }

+    /**
+     * The entire method is deprecated, but kept for compatibility with versions lower than or equal to 1.16.2.
+     * The method will be removed in future versions, because WorldEdit and FastAsyncWorldEdit only support the latest point
+     * release.
+     */
+    @Deprecated(forRemoval = true, since = "6.11.0")
    @Override
    public void generateNoise(
            @NotNull final WorldInfo worldInfo,
@@ -284,14 +283,9 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
        return super.getBaseHeight(worldInfo, random, x, z, heightMap);
    }

-    /**
-     * The entire method is deprecated, but kept for compatibility with versions lower than or equal to 1.16.2.
-     * The method will be removed in future versions, because WorldEdit and FastAsyncWorldEdit only support the latest point
-     * release.
-     */
    @SuppressWarnings("deprecation") // The entire method is deprecated, but kept for compatibility with <=1.16.2
    @Override
-    @Deprecated(since = "7.0.0")
+    @Deprecated(since = "TODO")
    public @NonNull ChunkData generateChunkData(
            @NonNull World world, @NonNull Random random, int x, int z, @NonNull BiomeGrid biome
    ) {
@@ -299,8 +293,8 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
            if (this.platformGenerator != this) {
                return this.platformGenerator.generateChunkData(world, random, x, z, biome);
            } else {
-                // Throw exception to be caught by the server that indicates the new generation API is being used.
-                throw new UnsupportedOperationException("Using new generation methods. This method is unsupported.");
+                // 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);
            }
        }

@@ -421,14 +415,9 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
        if (lastPlotArea != null && name.equals(this.levelName) && chunkX == lastChunkX && chunkZ == lastChunkZ) {
            return lastPlotArea;
        }
-        BlockVector3 loc = BlockVector3.at(chunkX << 4, 0, chunkZ << 4);
-        if (lastPlotArea != null && lastPlotArea.getRegion().contains(loc) && lastPlotArea.getRegion().contains(loc)) {
-            return lastPlotArea;
-        }
-        PlotArea area = UncheckedWorldLocation.at(name, loc).getPlotArea();
+        PlotArea area = UncheckedWorldLocation.at(name, chunkX << 4, 0, chunkZ << 4).getPlotArea();
        if (area == null) {
-            throw new IllegalStateException(String.format(
-                    "Cannot generate chunk that does not belong to a plot area. World: %s",
+            throw new IllegalStateException(String.format("Cannot generate chunk that does not belong to a plot area. World: %s",
                    name
            ));
        }
@@ -445,16 +434,9 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
        private static final List<Biome> BIOMES;

        static {
-            Set<Biome> disabledBiomes = EnumSet.of(Biome.CUSTOM);
-            if (PlotSquared.platform().serverVersion()[1] <= 19) {
-                final Biome cherryGrove = Registry.BIOME.get(NamespacedKey.minecraft("cherry_grove"));
-                if (cherryGrove != null) {
-                    disabledBiomes.add(cherryGrove);
-                }
-            }
-            BIOMES = Arrays.stream(Biome.values())
-                    .filter(not(disabledBiomes::contains))
-                    .toList();
+            ArrayList<Biome> biomes = new ArrayList<>(List.of(Biome.values()));
+            biomes.remove(Biome.CUSTOM);
+            BIOMES = List.copyOf(biomes);
        }

        @Override
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java
@@ -18,18 +18,22 @@
 */
 package com.plotsquared.bukkit.inject;

+import cloud.commandframework.CommandManager;
+import cloud.commandframework.execution.AsynchronousCommandExecutionCoordinator;
+import cloud.commandframework.paper.PaperCommandManager;
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import com.google.inject.assistedinject.FactoryModuleBuilder;
 import com.plotsquared.bukkit.BukkitPlatform;
-import com.plotsquared.bukkit.listener.ServerListener;
 import com.plotsquared.bukkit.listener.SingleWorldListener;
+import com.plotsquared.bukkit.player.BukkitPlayer;
 import com.plotsquared.bukkit.player.BukkitPlayerManager;
 import com.plotsquared.bukkit.queue.BukkitChunkCoordinator;
 import com.plotsquared.bukkit.queue.BukkitQueueCoordinator;
 import com.plotsquared.bukkit.schematic.BukkitSchematicHandler;
 import com.plotsquared.bukkit.util.BukkitChunkManager;
+import com.plotsquared.bukkit.util.BukkitEconHandler;
 import com.plotsquared.bukkit.util.BukkitInventoryUtil;
 import com.plotsquared.bukkit.util.BukkitRegionManager;
 import com.plotsquared.bukkit.util.BukkitSetupUtils;
@@ -47,9 +51,8 @@ import com.plotsquared.core.inject.factory.ChunkCoordinatorBuilderFactory;
 import com.plotsquared.core.inject.factory.ChunkCoordinatorFactory;
 import com.plotsquared.core.inject.factory.HybridPlotWorldFactory;
 import com.plotsquared.core.inject.factory.ProgressSubscriberFactory;
-import com.plotsquared.core.player.OfflinePlotPlayer;
+import com.plotsquared.core.player.ConsolePlayer;
 import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.world.DefaultPlotAreaManager;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.plot.world.SinglePlotAreaManager;
@@ -71,11 +74,13 @@ import com.sk89q.worldedit.extension.platform.Actor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.checkerframework.checker.nullness.qual.NonNull;

-import java.util.Objects;
+import java.util.function.Function;

 public class BukkitModule extends AbstractModule {

@@ -133,64 +138,44 @@ public class BukkitModule extends AbstractModule {
    @Provides
    @Singleton
    @NonNull EconHandler provideEconHandler() {
-        if (!Settings.Enabled_Components.ECONOMY || !Bukkit.getPluginManager().isPluginEnabled("Vault")) {
+        if (!Settings.Enabled_Components.ECONOMY) {
            return EconHandler.nullEconHandler();
        }
-        // Guice eagerly initializes singletons, so we need to bring the laziness ourselves
-        return new LazyEconHandler();
+        if (Bukkit.getPluginManager().isPluginEnabled("Vault")) {
+            try {
+                BukkitEconHandler econHandler = new BukkitEconHandler();
+                if (!econHandler.init()) {
+                    LOGGER.warn("Economy is enabled but no plugin is providing an economy service. Falling back...");
+                    return EconHandler.nullEconHandler();
+                }
+                return econHandler;
+            } catch (final Exception ignored) {
+            }
+        }
+        return EconHandler.nullEconHandler();
    }

-    private static final class LazyEconHandler extends EconHandler implements ServerListener.MutableEconHandler {
-        private volatile EconHandler implementation;
-
-        public void setImplementation(EconHandler econHandler) {
-            this.implementation = econHandler;
-        }
-
-        @Override
-        public boolean init() {
-            return get().init();
-        }
-
-        @Override
-        public double getBalance(final PlotPlayer<?> player) {
-            return get().getBalance(player);
-        }
-
-        @Override
-        public void withdrawMoney(final PlotPlayer<?> player, final double amount) {
-            get().withdrawMoney(player, amount);
-        }
-
-        @Override
-        public void depositMoney(final PlotPlayer<?> player, final double amount) {
-            get().depositMoney(player, amount);
-        }
-
-        @Override
-        public void depositMoney(final OfflinePlotPlayer player, final double amount) {
-            get().depositMoney(player, amount);
-        }
-
-        @Override
-        public boolean isEnabled(final PlotArea plotArea) {
-            return get().isEnabled(plotArea);
-        }
-
-        @Override
-        public @NonNull String format(final double balance) {
-            return get().format(balance);
-        }
-
-        @Override
-        public boolean isSupported() {
-            return get().isSupported();
-        }
-
-        private EconHandler get() {
-            return Objects.requireNonNull(this.implementation, "EconHandler not ready yet.");
-        }
+    @Provides
+    @Singleton
+    @NonNull CommandManager<PlotPlayer<?>> provideCommandManager() throws Exception {
+        final Function<PlotPlayer<?>, CommandSender> plotToPlatform = plotPlayer -> {
+            if (plotPlayer instanceof BukkitPlayer bukkitPlayer) {
+                return bukkitPlayer.getPlatformPlayer();
+            }
+            return Bukkit.getConsoleSender();
+        };
+        final Function<CommandSender, PlotPlayer<?>> platformToPlot = commandSender -> {
+            if (commandSender instanceof Player player) {
+                return BukkitUtil.adapt(player);
+            }
+            return ConsolePlayer.getConsole();
+        };

+        return new PaperCommandManager<>(
+                this.bukkitPlatform,
+                AsynchronousCommandExecutionCoordinator.<PlotPlayer<?>>builder().withSynchronousParsing().build(),
+                platformToPlot,
+                plotToPlatform
+        );
    }
-
 }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java
@@ -33,7 +33,6 @@ import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.flag.implementations.BlockBurnFlag;
 import com.plotsquared.core.plot.flag.implementations.BlockIgnitionFlag;
 import com.plotsquared.core.plot.flag.implementations.BreakFlag;
-import com.plotsquared.core.plot.flag.implementations.ConcreteHardenFlag;
 import com.plotsquared.core.plot.flag.implementations.CoralDryFlag;
 import com.plotsquared.core.plot.flag.implementations.CropGrowFlag;
 import com.plotsquared.core.plot.flag.implementations.DisablePhysicsFlag;
@@ -73,7 +72,6 @@ import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.type.Dispenser;
-import org.bukkit.block.data.type.Farmland;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.Player;
@@ -261,10 +259,7 @@ public class BlockEventListener implements Listener {
                final BlockFace facing = piston.getFacing();
                location = location.add(facing.getModX(), facing.getModY(), facing.getModZ());
                Plot newPlot = area.getOwnedPlotAbs(location);
-                if (plot.equals(newPlot)) {
-                    return;
-                }
-                if (!plot.isMerged() || !plot.getConnectedPlots().contains(newPlot)) {
+                if (!plot.equals(newPlot)) {
                    event.setCancelled(true);
                    plot.debug("Prevented piston update because of invalid edge piston detection");
                }
@@ -590,12 +585,6 @@ public class BlockEventListener implements Listener {
                event.setCancelled(true);
            }
        }
-        if (event.getNewState().getType().toString().endsWith("CONCRETE")) {
-            if (!plot.getFlag(ConcreteHardenFlag.class)) {
-                plot.debug("Concrete powder could not harden because concrete-harden = false");
-                event.setCancelled(true);
-            }
-        }
    }

    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@@ -757,35 +746,20 @@ public class BlockEventListener implements Listener {
        Block block = event.getBlock();
        Location location = BukkitUtil.adapt(block.getLocation());
        PlotArea area = location.getPlotArea();
-
        if (area == null) {
            return;
        }
-
        Plot plot = area.getOwnedPlot(location);
-
        if (plot == null) {
            event.setCancelled(true);
            return;
        }
-
-        if (block.getBlockData() instanceof Farmland farmland && event
-                .getNewState()
-                .getBlockData() instanceof Farmland newFarmland) {
-            int currentMoisture = farmland.getMoisture();
-            int newMoisture = newFarmland.getMoisture();
-
-            // farmland gets moisturizes
-            if (newMoisture > currentMoisture) {
-                return;
+        Material blockType = block.getType();
+        if (blockType == Material.FARMLAND) {
+            if (!plot.getFlag(SoilDryFlag.class)) {
+                plot.debug("Soil could not dry because soil-dry = false");
+                event.setCancelled(true);
            }
-
-            if (plot.getFlag(SoilDryFlag.class)) {
-                return;
-            }
-
-            plot.debug("Soil could not dry because soil-dry = false");
-            event.setCancelled(true);
        }
    }

@@ -1126,7 +1100,6 @@ public class BlockEventListener implements Listener {
            if (plot != null) {
                plot.debug("Explosion was cancelled because explosion = false");
            }
-            return;
        }
        event.blockList().removeIf(blox -> !plot.equals(area.getOwnedPlot(BukkitUtil.adapt(blox.getLocation()))));
    }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java
@@ -26,7 +26,6 @@ import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag;
 import com.plotsquared.core.plot.flag.implementations.MiscInteractFlag;
-import com.plotsquared.core.plot.flag.implementations.SculkSensorInteractFlag;
 import com.plotsquared.core.util.PlotFlagUtil;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -93,16 +92,12 @@ public class BlockEventListener117 implements Listener {
        }

        Plot plot = location.getOwnedPlot();
-        if (plot == null && !PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(
-                area,
-                MiscInteractFlag.class,
-                true
-        ) || plot != null && (!plot.getFlag(MiscInteractFlag.class) || !plot.getFlag(SculkSensorInteractFlag.class))) {
+        if (plot == null && !PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, MiscInteractFlag.class, true) || plot != null && !plot.getFlag(
+                MiscInteractFlag.class)) {
            if (plotPlayer != null) {
                if (plot != null) {
                    if (!plot.isAdded(plotPlayer.getUUID())) {
-                        plot.debug(plotPlayer.getName() + " couldn't trigger sculk sensors because both " +
-                                "sculk-sensor-interact and misc-interact = false");
+                        plot.debug(plotPlayer.getName() + " couldn't trigger sculk sensors because misc-interact = false");
                        event.setCancelled(true);
                    }
                }
@@ -113,15 +108,13 @@ public class BlockEventListener117 implements Listener {
                if (plot != null) {
                    if (itemThrower == null && (itemThrower = item.getOwner()) == null) {
                        plot.debug(
-                                "A thrown item couldn't trigger sculk sensors because both sculk-sensor-interact and " +
-                                        "misc-interact = false and the item's owner could not be resolved.");
+                                "A thrown item couldn't trigger sculk sensors because misc-interact = false and the item's owner could not be resolved.");
                        event.setCancelled(true);
                        return;
                    }
                    if (!plot.isAdded(itemThrower)) {
                        if (!plot.isAdded(itemThrower)) {
-                            plot.debug("A thrown item couldn't trigger sculk sensors because both sculk-sensor-interact and " +
-                                    "misc-interact = false");
+                            plot.debug("A thrown item couldn't trigger sculk sensors because misc-interact = false");
                            event.setCancelled(true);
                        }
                    }
@@ -140,6 +133,7 @@ public class BlockEventListener117 implements Listener {
        if (area == null) {
            for (int i = blocks.size() - 1; i >= 0; i--) {
                Location blockLocation = BukkitUtil.adapt(blocks.get(i).getLocation());
+                blockLocation = BukkitUtil.adapt(blocks.get(i).getLocation());
                if (blockLocation.isPlotArea()) {
                    blocks.remove(i);
                }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java
@@ -26,7 +26,6 @@ import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.plot.world.SinglePlotArea;
-import com.plotsquared.core.util.ReflectionUtils;
 import com.plotsquared.core.util.ReflectionUtils.RefClass;
 import com.plotsquared.core.util.ReflectionUtils.RefField;
 import com.plotsquared.core.util.ReflectionUtils.RefMethod;
@@ -65,11 +64,9 @@ public class ChunkListener implements Listener {
    private final PlotAreaManager plotAreaManager;
    private final int version;

-    private RefMethod methodSetUnsaved;
    private RefMethod methodGetHandleChunk;
    private RefMethod methodGetHandleWorld;
-    private RefField mustNotSave;
-    private Object objChunkStatusFull = null;
+    private RefField mustSave;
    /*
    private RefMethod methodGetFullChunk;
    private RefMethod methodGetBukkitChunk;
@@ -82,6 +79,7 @@ public class ChunkListener implements Listener {
    */
    private Chunk lastChunk;
    private boolean ignoreUnload = false;
+    private boolean isTrueForNotSave = true;

    @Inject
    public ChunkListener(final @NonNull PlotAreaManager plotAreaManager) {
@@ -92,27 +90,22 @@ public class ChunkListener implements Listener {
        }
        try {
            RefClass classCraftWorld = getRefClass("{cb}.CraftWorld");
+            this.methodGetHandleWorld = classCraftWorld.getMethod("getHandle");
            RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
-            ReflectionUtils.RefClass classChunkAccess = getRefClass("net.minecraft.world.level.chunk.IChunkAccess");
-            this.methodSetUnsaved = classChunkAccess.getMethod("a", boolean.class);
-            try {
-                this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle");
-            } catch (NoSuchMethodException ignored) {
-                try {
-                    RefClass classChunkStatus = getRefClass("net.minecraft.world.level.chunk.ChunkStatus");
-                    this.objChunkStatusFull = classChunkStatus.getRealClass().getField("n").get(null);
-                    this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle", classChunkStatus.getRealClass());
-                } catch (NoSuchMethodException ex) {
-                    throw new RuntimeException(ex);
-                }
-            }
+            this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle");
            try {
                if (version < 17) {
                    RefClass classChunk = getRefClass("{nms}.Chunk");
-                    this.mustNotSave = classChunk.getField("mustNotSave");
+                    if (version == 13) {
+                        this.mustSave = classChunk.getField("mustSave");
+                        this.isTrueForNotSave = false;
+                    } else {
+                        this.mustSave = classChunk.getField("mustNotSave");
+                    }
                } else {
                    RefClass classChunk = getRefClass("net.minecraft.world.level.chunk.Chunk");
-                    this.mustNotSave = classChunk.getField("mustNotSave");
+                    this.mustSave = classChunk.getField("mustNotSave");
+
                }
            } catch (NoSuchFieldException e) {
                e.printStackTrace();
@@ -174,13 +167,10 @@ public class ChunkListener implements Listener {
        if (safe && shouldSave(world, chunk.getX(), chunk.getZ())) {
            return false;
        }
-        Object c = objChunkStatusFull != null
-                ? this.methodGetHandleChunk.of(chunk).call(objChunkStatusFull)
-                : this.methodGetHandleChunk.of(chunk).call();
-        RefField.RefExecutor field = this.mustNotSave.of(c);
-        methodSetUnsaved.of(c).call(false);
-        if (!((Boolean) field.get())) {
-            field.set(true);
+        Object c = this.methodGetHandleChunk.of(chunk).call();
+        RefField.RefExecutor field = this.mustSave.of(c);
+        if ((Boolean) field.get() != isTrueForNotSave) {
+            field.set(isTrueForNotSave);
            if (chunk.isLoaded()) {
                ignoreUnload = true;
                chunk.unload(false);
@@ -244,8 +234,7 @@ public class ChunkListener implements Listener {
        Chunk chunk = event.getChunk();
        if (Settings.Chunk_Processor.AUTO_TRIM) {
            String world = chunk.getWorld().getName();
-            if ((!Settings.Enabled_Components.WORLDS || !SinglePlotArea.isSinglePlotWorld(world)) && this.plotAreaManager.hasPlotArea(
-                    world)) {
+            if ((!Settings.Enabled_Components.WORLDS || !SinglePlotArea.isSinglePlotWorld(world)) && this.plotAreaManager.hasPlotArea(world)) {
                if (unloadChunk(world, chunk, true)) {
                    return;
                }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java
@@ -19,7 +19,6 @@
 package com.plotsquared.bukkit.listener;

 import com.google.inject.Inject;
-import com.plotsquared.bukkit.BukkitPlatform;
 import com.plotsquared.bukkit.player.BukkitPlayer;
 import com.plotsquared.bukkit.util.BukkitEntityUtil;
 import com.plotsquared.bukkit.util.BukkitUtil;
@@ -36,13 +35,11 @@ import com.plotsquared.core.plot.flag.implementations.DisablePhysicsFlag;
 import com.plotsquared.core.plot.flag.implementations.EntityChangeBlockFlag;
 import com.plotsquared.core.plot.flag.implementations.ExplosionFlag;
 import com.plotsquared.core.plot.flag.implementations.InvincibleFlag;
-import com.plotsquared.core.plot.flag.implementations.ProjectileChangeBlockFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.PlotFlagUtil;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.world.block.BlockType;
-import io.papermc.lib.PaperLib;
 import org.bukkit.Material;
 import org.bukkit.Particle;
 import org.bukkit.World;
@@ -80,18 +77,15 @@ import java.util.List;
@SuppressWarnings("unused")
 public class EntityEventListener implements Listener {

-    private final BukkitPlatform platform;
    private final PlotAreaManager plotAreaManager;
    private final EventDispatcher eventDispatcher;
    private float lastRadius;

    @Inject
    public EntityEventListener(
-            final @NonNull BukkitPlatform platform,
            final @NonNull PlotAreaManager plotAreaManager,
            final @NonNull EventDispatcher eventDispatcher
    ) {
-        this.platform = platform;
        this.plotAreaManager = plotAreaManager;
        this.eventDispatcher = eventDispatcher;
    }
@@ -149,55 +143,56 @@ public class EntityEventListener implements Listener {
        if (area == null) {
            return;
        }
-        // Armour-stands are handled elsewhere and should not be handled by area-wide entity-spawn options
-        if (entity.getType() == EntityType.ARMOR_STAND) {
-            return;
-        }
        CreatureSpawnEvent.SpawnReason reason = event.getSpawnReason();
        switch (reason.toString()) {
-            case "DISPENSE_EGG", "EGG", "OCELOT_BABY", "SPAWNER_EGG" -> {
+            case "DISPENSE_EGG":
+            case "EGG":
+            case "OCELOT_BABY":
+            case "SPAWNER_EGG":
                if (!area.isSpawnEggs()) {
                    event.setCancelled(true);
                    return;
                }
-            }
-            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL",
-                    "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN", "NETHER_PORTAL",
-                    "DUPLICATION", "FROZEN", "SPELL", "DEFAULT" -> {
+                break;
+            case "REINFORCEMENTS":
+            case "NATURAL":
+            case "MOUNT":
+            case "PATROL":
+            case "RAID":
+            case "SHEARED":
+            case "SILVERFISH_BLOCK":
+            case "ENDER_PEARL":
+            case "TRAP":
+            case "VILLAGE_DEFENSE":
+            case "VILLAGE_INVASION":
+            case "BEEHIVE":
+            case "CHUNK_GEN":
                if (!area.isMobSpawning()) {
                    event.setCancelled(true);
                    return;
                }
-            }
-            case "BREEDING" -> {
+                break;
+            case "BREEDING":
                if (!area.isSpawnBreeding()) {
                    event.setCancelled(true);
                    return;
                }
-            }
-            case "CUSTOM" -> {
-                if (!area.isSpawnCustom()) {
+                break;
+            case "BUILD_IRONGOLEM":
+            case "BUILD_SNOWMAN":
+            case "BUILD_WITHER":
+            case "CUSTOM":
+                if (!area.isSpawnCustom() && entity.getType() != EntityType.ARMOR_STAND) {
                    event.setCancelled(true);
                    return;
                }
-                // No need to clutter metadata if running paper
-                if (!PaperLib.isPaper()) {
-                    entity.setMetadata("ps_custom_spawned", new FixedMetadataValue(this.platform, true));
-                }
-                return; // Don't cancel if mob spawning is disabled
-            }
-            case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER" -> {
-                if (!area.isSpawnCustom()) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            case "SPAWNER" -> {
+                break;
+            case "SPAWNER":
                if (!area.isMobSpawnerSpawning()) {
                    event.setCancelled(true);
                    return;
                }
-            }
+                break;
        }
        Plot plot = area.getOwnedPlotAbs(location);
        if (plot == null) {
@@ -375,13 +370,13 @@ public class EntityEventListener implements Listener {
            if (shooter instanceof Player) {
                PlotPlayer<?> pp = BukkitUtil.adapt((Player) shooter);
                if (plot == null) {
-                    if (area.isRoadFlags() && !area.getRoadFlag(ProjectileChangeBlockFlag.class) && !pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
+                    if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
                        entity.remove();
                        event.setCancelled(true);
                    }
                    return;
                }
-                if (plot.isAdded(pp.getUUID()) || plot.getFlag(ProjectileChangeBlockFlag.class) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
+                if (plot.isAdded(pp.getUUID()) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
                    return;
                }
                entity.remove();
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java
@@ -120,14 +120,9 @@ public class EntitySpawnListener implements Listener {
        Entity entity = event.getEntity();
        Location location = BukkitUtil.adapt(entity.getLocation());
        PlotArea area = location.getPlotArea();
-        if (!location.isPlotArea() || area == null) {
+        if (!location.isPlotArea()) {
            return;
        }
-        if (PaperLib.isPaper()) {
-            if (area.isSpawnCustom() && "CUSTOM".equals(entity.getEntitySpawnReason().name())) {
-                return;
-            }
-        }
        Plot plot = location.getOwnedPlotAbs();
        EntityType type = entity.getType();
        if (plot == null) {
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java
@@ -43,10 +43,10 @@ import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
 import com.plotsquared.core.plot.flag.types.BooleanFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
-import com.plotsquared.core.util.PlotFlagUtil;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import com.plotsquared.core.util.PlotFlagUtil;
 import org.bukkit.Chunk;
 import org.bukkit.block.Block;
 import org.bukkit.block.TileState;
@@ -124,7 +124,7 @@ public class PaperListener implements Listener {
        }
        Slime slime = event.getEntity();

-        Block b = slime.getTargetBlockExact(4);
+        Block b = slime.getTargetBlock(4);
        if (b == null) {
            return;
        }
@@ -166,57 +166,71 @@ public class PaperListener implements Listener {
        }
        Location location = BukkitUtil.adapt(event.getSpawnLocation());
        PlotArea area = location.getPlotArea();
-        if (area == null) {
+        if (!location.isPlotArea()) {
            return;
        }
-        // Armour-stands are handled elsewhere and should not be handled by area-wide entity-spawn options
-        if (event.getType() == EntityType.ARMOR_STAND) {
-            return;
-        }
-        // If entities are spawning... the chunk should be loaded?
+        //If entities are spawning... the chunk should be loaded?
        Entity[] entities = event.getSpawnLocation().getChunk().getEntities();
-        if (entities.length >= Settings.Chunk_Processor.MAX_ENTITIES) {
+        if (entities.length > Settings.Chunk_Processor.MAX_ENTITIES) {
            event.setShouldAbortSpawn(true);
            event.setCancelled(true);
            return;
        }
        CreatureSpawnEvent.SpawnReason reason = event.getReason();
        switch (reason.toString()) {
-            case "DISPENSE_EGG", "EGG", "OCELOT_BABY", "SPAWNER_EGG" -> {
+            case "DISPENSE_EGG":
+            case "EGG":
+            case "OCELOT_BABY":
+            case "SPAWNER_EGG":
                if (!area.isSpawnEggs()) {
                    event.setShouldAbortSpawn(true);
                    event.setCancelled(true);
                    return;
                }
-            }
-            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL", "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
+                break;
+            case "REINFORCEMENTS":
+            case "NATURAL":
+            case "MOUNT":
+            case "PATROL":
+            case "RAID":
+            case "SHEARED":
+            case "SILVERFISH_BLOCK":
+            case "ENDER_PEARL":
+            case "TRAP":
+            case "VILLAGE_DEFENSE":
+            case "VILLAGE_INVASION":
+            case "BEEHIVE":
+            case "CHUNK_GEN":
                if (!area.isMobSpawning()) {
                    event.setShouldAbortSpawn(true);
                    event.setCancelled(true);
                    return;
                }
-            }
-            case "BREEDING" -> {
+                break;
+            case "BREEDING":
                if (!area.isSpawnBreeding()) {
                    event.setShouldAbortSpawn(true);
                    event.setCancelled(true);
                    return;
                }
-            }
-            case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER", "CUSTOM" -> {
-                if (!area.isSpawnCustom()) {
+                break;
+            case "BUILD_IRONGOLEM":
+            case "BUILD_SNOWMAN":
+            case "BUILD_WITHER":
+            case "CUSTOM":
+                if (!area.isSpawnCustom() && event.getType() != EntityType.ARMOR_STAND) {
                    event.setShouldAbortSpawn(true);
                    event.setCancelled(true);
                    return;
                }
-            }
-            case "SPAWNER" -> {
+                break;
+            case "SPAWNER":
                if (!area.isMobSpawnerSpawning()) {
                    event.setShouldAbortSpawn(true);
                    event.setCancelled(true);
                    return;
                }
-            }
+                break;
        }
        Plot plot = location.getOwnedPlotAbs();
        if (plot == null) {
@@ -443,11 +457,9 @@ public class PaperListener implements Listener {
        }
    }

-    private boolean getBooleanFlagValue(
-            @NonNull FlagContainer container,
-            @NonNull Class<? extends BooleanFlag<?>> flagClass,
-            boolean defaultValue
-    ) {
+    private boolean getBooleanFlagValue(@NonNull FlagContainer container,
+                                        @NonNull Class<? extends BooleanFlag<?>> flagClass,
+                                        boolean defaultValue) {
        BooleanFlag<?> flag = container.getFlag(flagClass);
        return flag == null ? defaultValue : flag.getValue();
    }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
@@ -50,7 +50,6 @@ import com.plotsquared.core.plot.flag.implementations.DenyPortalsFlag;
 import com.plotsquared.core.plot.flag.implementations.DenyTeleportFlag;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 import com.plotsquared.core.plot.flag.implementations.DropProtectionFlag;
-import com.plotsquared.core.plot.flag.implementations.EditSignFlag;
 import com.plotsquared.core.plot.flag.implementations.HangingBreakFlag;
 import com.plotsquared.core.plot.flag.implementations.HangingPlaceFlag;
 import com.plotsquared.core.plot.flag.implementations.HostileInteractFlag;
@@ -88,7 +87,6 @@ import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
-import org.bukkit.block.Sign;
 import org.bukkit.block.data.Waterlogged;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.ArmorStand;
@@ -177,33 +175,6 @@ public class PlayerEventListener implements Listener {
            Material.WRITABLE_BOOK,
            Material.WRITTEN_BOOK
    );
-    private static final Set<String> DYES;
-    static {
-        Set<String> mutableDyes = new HashSet<>(Set.of(
-                "WHITE_DYE",
-                "LIGHT_GRAY_DYE",
-                "GRAY_DYE",
-                "BLACK_DYE",
-                "BROWN_DYE",
-                "RED_DYE",
-                "ORANGE_DYE",
-                "YELLOW_DYE",
-                "LIME_DYE",
-                "GREEN_DYE",
-                "CYAN_DYE",
-                "LIGHT_BLUE_DYE",
-                "BLUE_DYE",
-                "PURPLE_DYE",
-                "MAGENTA_DYE",
-                "PINK_DYE",
-                "GLOW_INK_SAC"
-        ));
-        int[] version = PlotSquared.platform().serverVersion();
-        if (version[1] >= 20 && version[2] >= 1) {
-            mutableDyes.add("HONEYCOMB");
-        }
-        DYES = Set.copyOf(mutableDyes);
-    }
    private final EventDispatcher eventDispatcher;
    private final WorldEdit worldEdit;
    private final PlotAreaManager plotAreaManager;
@@ -236,40 +207,6 @@ public class PlayerEventListener implements Listener {
        this.plotListener = plotListener;
    }

-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPlayerDyeSign(PlayerInteractEvent event) {
-        ItemStack itemStack = event.getItem();
-        if (itemStack == null) {
-            return;
-        }
-        Block block = event.getClickedBlock();
-        if (block != null && block.getState() instanceof Sign) {
-            if (DYES.contains(itemStack.getType().toString())) {
-                Location location = BukkitUtil.adapt(block.getLocation());
-                PlotArea area = location.getPlotArea();
-                if (area == null) {
-                    return;
-                }
-                Plot plot = location.getOwnedPlot();
-                if (plot == null) {
-                    if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, EditSignFlag.class, false)
-                            && !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString())) {
-                        event.setCancelled(true);
-                    }
-                    return;
-                }
-                if (plot.isAdded(event.getPlayer().getUniqueId())) {
-                    return; // allow for added players
-                }
-                if (!plot.getFlag(EditSignFlag.class)
-                        && !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString())) {
-                    plot.debug(event.getPlayer().getName() + " could not color the sign because of edit-sign = false");
-                    event.setCancelled(true);
-                }
-            }
-        }
-    }
-
    @EventHandler(ignoreCancelled = true)
    public void onEffect(@NonNull EntityPotionEffectEvent event) {
        if (Settings.Enabled_Components.DISABLE_BEACON_EFFECT_OVERFLOW ||
@@ -336,7 +273,8 @@ public class PlayerEventListener implements Listener {
        Plot plot = plotPlayer.getCurrentPlot();
        // Check WorldEdit
        switch (parts[0]) {
-            case "up", "worldedit:up" -> {
+            case "up":
+            case "worldedit:up":
                if (plot == null || (!plot.isAdded(plotPlayer.getUUID()) && !plotPlayer.hasPermission(
                        Permission.PERMISSION_ADMIN_BUILD_OTHER,
                        true
@@ -344,7 +282,6 @@ public class PlayerEventListener implements Listener {
                    event.setCancelled(true);
                    return;
                }
-            }
        }
        if (plot == null && !area.isRoadFlags()) {
            return;
@@ -432,7 +369,6 @@ public class PlayerEventListener implements Listener {
    }

    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    @SuppressWarnings("deprecation") // Paper deprecation
    public void onConnect(PlayerJoinEvent event) {
        final Player player = event.getPlayer();
        PlotSquared.platform().playerManager().removePlayer(player.getUniqueId());
@@ -636,8 +572,7 @@ public class PlayerEventListener implements Listener {
            if (now == null) {
                try (final MetaDataAccess<Boolean> kickAccess =
                             pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
-                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(
-                            false)) {
+                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
                        pp.sendMessage(
                                TranslatableCaption.of("permission.no_permission_event"),
                                TagResolver.resolver(
@@ -671,7 +606,7 @@ public class PlayerEventListener implements Listener {
                this.tmpTeleport = true;
                return;
            }
-            int border = area.getBorder(true);
+            int border = area.getBorder();
            int x1;
            if (x2 > border && this.tmpTeleport) {
                if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_BORDER)) {
@@ -730,8 +665,7 @@ public class PlayerEventListener implements Listener {
            if (plot == null) {
                try (final MetaDataAccess<Boolean> kickAccess =
                             pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
-                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(
-                            false)) {
+                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
                        pp.sendMessage(
                                TranslatableCaption.of("permission.no_permission_event"),
                                TagResolver.resolver(
@@ -766,7 +700,7 @@ public class PlayerEventListener implements Listener {
                this.tmpTeleport = true;
                return;
            }
-            int border = area.getBorder(true);
+            int border = area.getBorder();
            int z1;
            if (z2 > border && this.tmpTeleport) {
                if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_BORDER)) {
@@ -797,7 +731,6 @@ public class PlayerEventListener implements Listener {
    }

    @EventHandler(priority = EventPriority.LOW)
-    @SuppressWarnings("deprecation") // Paper deprecation
    public void onChat(AsyncPlayerChatEvent event) {
        if (event.isCancelled()) {
            return;
@@ -1128,7 +1061,6 @@ public class PlayerEventListener implements Listener {
    }

    @EventHandler(priority = EventPriority.LOW)
-    @SuppressWarnings("deprecation") // Paper deprecation
    public void onCancelledInteract(PlayerInteractEvent event) {
        if (event.isCancelled() && event.getAction() == Action.RIGHT_CLICK_AIR) {
            Player player = event.getPlayer();
@@ -1182,13 +1114,13 @@ public class PlayerEventListener implements Listener {
        Location location = BukkitUtil.adapt(block.getLocation());
        Action action = event.getAction();
        switch (action) {
-            case PHYSICAL -> {
+            case PHYSICAL: {
                eventType = PlayerBlockEventType.TRIGGER_PHYSICAL;
                blocktype1 = BukkitAdapter.asBlockType(block.getType());
+                break;
            }
-
            //todo rearrange the right click code. it is all over the place.
-            case RIGHT_CLICK_BLOCK -> {
+            case RIGHT_CLICK_BLOCK: {
                Material blockType = block.getType();
                eventType = PlayerBlockEventType.INTERACT_BLOCK;
                blocktype1 = BukkitAdapter.asBlockType(block.getType());
@@ -1210,16 +1142,21 @@ public class PlayerEventListener implements Listener {

                // in the following, lb needs to have the material of the item in hand i.e. type
                switch (type.toString()) {
-                    case "REDSTONE", "STRING", "PUMPKIN_SEEDS", "MELON_SEEDS", "COCOA_BEANS", "WHEAT_SEEDS", "BEETROOT_SEEDS",
-                            "SWEET_BERRIES", "GLOW_BERRIES" -> {
+                    case "REDSTONE":
+                    case "STRING":
+                    case "PUMPKIN_SEEDS":
+                    case "MELON_SEEDS":
+                    case "COCOA_BEANS":
+                    case "WHEAT_SEEDS":
+                    case "BEETROOT_SEEDS":
+                    case "SWEET_BERRIES":
+                    case "GLOW_BERRIES":
                        return;
-                    }
-                    default -> {
+                    default:
                        //eventType = PlayerBlockEventType.PLACE_BLOCK;
                        if (type.isBlock()) {
                            return;
                        }
-                    }
                }
                if (PaperLib.isPaper()) {
                    if (MaterialTags.SPAWN_EGGS.isTagged(type) || Material.EGG.equals(type)) {
@@ -1233,7 +1170,7 @@ public class PlayerEventListener implements Listener {
                    }
                }
                if (type.isEdible()) {
-                    //Allow all players to eat while also allowing the block place event to be fired
+                    //Allow all players to eat while also allowing the block place event ot be fired
                    return;
                }
                if (type == Material.ARMOR_STAND) {
@@ -1252,8 +1189,9 @@ public class PlayerEventListener implements Listener {
                    eventType = PlayerBlockEventType.READ;
                    break;
                }
+                break;
            }
-            case LEFT_CLICK_BLOCK -> {
+            case LEFT_CLICK_BLOCK: {
                Material blockType = block.getType();

                // todo: when the code above is rearranged, it would be great to beautify this as well.
@@ -1264,10 +1202,10 @@ public class PlayerEventListener implements Listener {

                eventType = PlayerBlockEventType.INTERACT_BLOCK;
                blocktype1 = BukkitAdapter.asBlockType(block.getType());
+                break;
            }
-            default -> {
+            default:
                return;
-            }
        }
        if (this.worldEdit != null && pp.getAttribute("worldedit")) {
            if (event.getMaterial() == Material.getMaterial(this.worldEdit.getConfiguration().wandItem)) {
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener1201.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener1201.java
@@ -1,66 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.listener;
-
-import com.plotsquared.bukkit.util.BukkitUtil;
-import com.plotsquared.core.location.Location;
-import com.plotsquared.core.permissions.Permission;
-import com.plotsquared.core.plot.Plot;
-import com.plotsquared.core.plot.PlotArea;
-import com.plotsquared.core.plot.flag.implementations.EditSignFlag;
-import com.plotsquared.core.util.PlotFlagUtil;
-import org.bukkit.block.Sign;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerSignOpenEvent;
-
-/**
- * For events since 1.20.1
- * @since 7.2.1
- */
-public class PlayerEventListener1201 implements Listener {
-
-    @EventHandler(ignoreCancelled = true)
-    @SuppressWarnings({"removal", "UnstableApiUsage"}) // thanks Paper, thanks Spigot
-    public void onPlayerSignOpenEvent(PlayerSignOpenEvent event) {
-        Sign sign = event.getSign();
-        Location location = BukkitUtil.adapt(sign.getLocation());
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            return;
-        }
-        Plot plot = location.getOwnedPlot();
-        if (plot == null) {
-            if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, EditSignFlag.class, false)
-                    && !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString())) {
-                event.setCancelled(true);
-            }
-            return;
-        }
-        if (plot.isAdded(event.getPlayer().getUniqueId())) {
-            return; // allow for added players
-        }
-        if (!plot.getFlag(EditSignFlag.class)
-                && !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString())) {
-            plot.debug(event.getPlayer().getName() + " could not edit the sign because of edit-sign = false");
-            event.setCancelled(true);
-        }
-    }
-
-}
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java
@@ -30,9 +30,9 @@ import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.PlotHandler;
 import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
-import com.plotsquared.core.util.PlotFlagUtil;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import com.plotsquared.core.util.PlotFlagUtil;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ServerListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ServerListener.java
@@ -21,14 +21,9 @@ package com.plotsquared.bukkit.listener;
 import com.google.inject.Inject;
 import com.plotsquared.bukkit.BukkitPlatform;
 import com.plotsquared.bukkit.placeholder.MVdWPlaceholders;
-import com.plotsquared.bukkit.util.BukkitEconHandler;
-import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.player.ConsolePlayer;
-import com.plotsquared.core.util.EconHandler;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -37,8 +32,6 @@ import org.checkerframework.checker.nullness.qual.NonNull;

 public class ServerListener implements Listener {

-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + ServerListener.class.getSimpleName());
-
    private final BukkitPlatform plugin;

    @Inject
@@ -52,29 +45,6 @@ public class ServerListener implements Listener {
            new MVdWPlaceholders(this.plugin, this.plugin.placeholderRegistry());
            ConsolePlayer.getConsole().sendMessage(TranslatableCaption.of("placeholder.hooked"));
        }
-        if (Settings.Enabled_Components.ECONOMY && Bukkit.getPluginManager().isPluginEnabled("Vault")) {
-            EconHandler econHandler = new BukkitEconHandler();
-            try {
-                if (!econHandler.init()) {
-                    LOGGER.warn("Economy is enabled but no plugin is providing an economy service. Falling back...");
-                    econHandler = EconHandler.nullEconHandler();
-                }
-            } catch (final Exception ignored) {
-                econHandler = EconHandler.nullEconHandler();
-            }
-            if (PlotSquared.platform().econHandler() instanceof MutableEconHandler meh) {
-                meh.setImplementation(econHandler);
-            }
-        }
-    }
-
-    /**
-     * Internal use only. Required to implement lazy econ loading using Guice.
-     *
-     * @since 7.2.0
-     */
-    public interface MutableEconHandler {
-        void setImplementation(EconHandler econHandler);
    }

 }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/SingleWorldListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/SingleWorldListener.java
@@ -31,39 +31,45 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.world.ChunkEvent;
 import org.bukkit.event.world.ChunkLoadEvent;

+import java.lang.reflect.Field;
 import java.lang.reflect.Method;

 import static com.plotsquared.core.util.ReflectionUtils.getRefClass;

 public class SingleWorldListener implements Listener {

-    private final Method methodSetUnsaved;
-    private Method methodGetHandleChunk;
-    private Object objChunkStatusFull = null;
+    private final Method methodGetHandleChunk;
+    private Field shouldSave = null;

    public SingleWorldListener() throws Exception {
        ReflectionUtils.RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
-        ReflectionUtils.RefClass classChunkAccess = getRefClass("net.minecraft.world.level.chunk.IChunkAccess");
-        this.methodSetUnsaved = classChunkAccess.getMethod("a", boolean.class).getRealMethod();
+        this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle").getRealMethod();
        try {
-            this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle").getRealMethod();
-        } catch (NoSuchMethodException ignored) {
-            try {
-                ReflectionUtils.RefClass classChunkStatus = getRefClass("net.minecraft.world.level.chunk.ChunkStatus");
-                this.objChunkStatusFull = classChunkStatus.getRealClass().getField("n").get(null);
-                this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle", classChunkStatus.getRealClass()).getRealMethod();
-            } catch (NoSuchMethodException ex) {
-                throw new RuntimeException(ex);
+            if (PlotSquared.platform().serverVersion()[1] < 17) {
+                ReflectionUtils.RefClass classChunk = getRefClass("{nms}.Chunk");
+                if (PlotSquared.platform().serverVersion()[1] == 13) {
+                    this.shouldSave = classChunk.getField("mustSave").getRealField();
+                } else {
+                    this.shouldSave = classChunk.getField("s").getRealField();
+                }
+            } else if (PlotSquared.platform().serverVersion()[1] == 17) {
+                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();
        }
    }

    public void markChunkAsClean(Chunk chunk) {
        try {
-            Object nmsChunk = objChunkStatusFull != null
-                    ? this.methodGetHandleChunk.invoke(chunk, objChunkStatusFull)
-                    : this.methodGetHandleChunk.invoke(chunk);
-            methodSetUnsaved.invoke(nmsChunk, false);
+            Object nmsChunk = methodGetHandleChunk.invoke(chunk);
+            if (shouldSave != null) {
+                this.shouldSave.set(nmsChunk, false);
+            }
        } catch (Throwable e) {
            e.printStackTrace();
        }
@@ -79,12 +85,7 @@ public class SingleWorldListener implements Listener {
        if (!SinglePlotArea.isSinglePlotWorld(name)) {
            return;
        }
-        int x = event.getChunk().getX();
-        int z = event.getChunk().getZ();
-        if (x < 16 && x > -16 && z < 16 && z > -16) {
-            // Allow spawn to generate
-            return;
-        }
+
        markChunkAsClean(event.getChunk());
    }

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/managers/HyperverseWorldManager.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/managers/HyperverseWorldManager.java
@@ -0,0 +1,63 @@
+/*
+ * PlotSquared, a land and world management plugin for Minecraft.
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ * Copyright (C) IntellectualSites team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.bukkit.managers;
+
+/*
+import com.google.inject.Singleton;
+import org.bukkit.World;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import se.hyperver.hyperverse.Hyperverse;
+import se.hyperver.hyperverse.world.WorldConfiguration;
+import se.hyperver.hyperverse.world.WorldConfigurationBuilder;
+import se.hyperver.hyperverse.world.WorldFeatures;
+import se.hyperver.hyperverse.world.WorldType;
+
+Hyperverse implementation is currently put on ice until Hyperverse is released on a stable line and deployed to the central
+repository.
+
+@Singleton
+public class HyperverseWorldManager extends BukkitWorldManager {
+
+    @Override
+    public @Nullable World handleWorldCreation(@NonNull String worldName, @Nullable String generator) {
+        // First let Bukkit register the world
+        this.setGenerator(worldName, generator);
+        // Create the world
+        final WorldConfigurationBuilder worldConfigurationBuilder = WorldConfiguration.builder()
+                .setName(worldName).setType(WorldType.OVER_WORLD);
+        if (generator != null) {
+            worldConfigurationBuilder.setGenerator(generator).setWorldFeatures(WorldFeatures.FLATLAND);
+        }
+        try {
+            return Hyperverse.getApi().createWorld(worldConfigurationBuilder.createWorldConfiguration())
+                    .getBukkitWorld();
+        } catch (final Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    @Override
+    public String getName() {
+        return "bukkit-hyperverse";
+    }
+
+}
+ */
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/MVdWPlaceholders.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/MVdWPlaceholders.java
@@ -52,7 +52,7 @@ public class MVdWPlaceholders {

    @Subscribe
    public void onNewPlaceholder(final PlaceholderRegistry.@NonNull PlaceholderAddedEvent event) {
-        this.addPlaceholder(event.placeholder());
+        this.addPlaceholder(event.getPlaceholder());
    }

    private void addPlaceholder(final @NonNull Placeholder placeholder) {
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PAPIPlaceholders.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PAPIPlaceholders.java
@@ -20,8 +20,6 @@ package com.plotsquared.bukkit.placeholder;

 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.flag.implementations.DoneFlag;
-import com.plotsquared.core.util.query.PlotQuery;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.entity.Player;
@@ -85,20 +83,6 @@ public class PAPIPlaceholders extends PlaceholderExpansion {
            return String.valueOf(pl.getPlotCount(identifier));
        }

-        if (identifier.startsWith("base_plot_count_")) {
-            identifier = identifier.substring("base_plot_count_".length());
-            if (identifier.isEmpty()) {
-                return "";
-            }
-
-            return String.valueOf(PlotQuery.newQuery()
-                    .ownedBy(pl)
-                    .inWorld(identifier)
-                    .whereBasePlot()
-                    .thatPasses(plot -> !DoneFlag.isDone(plot))
-                    .count());
-        }
-
        // PlotSquared placeholders
        return PlotSquared.platform().placeholderRegistry().getPlaceholderValue(identifier, pl);
    }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java
@@ -43,7 +43,7 @@ public class BukkitOfflinePlayer implements OfflinePlotPlayer {
     */
    public BukkitOfflinePlayer(
            final @NonNull OfflinePlayer player, final @NonNull
-    PermissionHandler permissionHandler
+            PermissionHandler permissionHandler
    ) {
        this.player = player;
        this.permissionProfile = permissionHandler.getPermissionProfile(this)
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
@@ -40,7 +40,6 @@ import io.papermc.lib.PaperLib;
 import net.kyori.adventure.audience.Audience;
 import org.bukkit.GameMode;
 import org.bukkit.Sound;
-import org.bukkit.SoundCategory;
 import org.bukkit.WeatherType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
@@ -52,6 +51,7 @@ import org.bukkit.potion.PotionEffectType;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.checkerframework.checker.nullness.qual.NonNull;

+import java.util.Arrays;
 import java.util.Set;
 import java.util.UUID;

@@ -158,7 +158,6 @@ public class BukkitPlayer extends PlotPlayer<Player> {
        }
        final String[] nodes = stub.split("\\.");
        final StringBuilder n = new StringBuilder();
-        // Wildcard check from less specific permission to more specific permission
        for (int i = 0; i < (nodes.length - 1); i++) {
            n.append(nodes[i]).append(".");
            if (!stub.equals(n + Permission.PERMISSION_STAR.toString())) {
@@ -167,11 +166,9 @@ public class BukkitPlayer extends PlotPlayer<Player> {
                }
            }
        }
-        // Wildcard check for the full permission
        if (hasPermission(stub + ".*")) {
            return Integer.MAX_VALUE;
        }
-        // Permission value cache for iterative check
        int max = 0;
        if (CHECK_EFFECTIVE) {
            boolean hasAny = false;
@@ -179,10 +176,6 @@ public class BukkitPlayer extends PlotPlayer<Player> {
            final Set<PermissionAttachmentInfo> effective = player.getEffectivePermissions();
            if (!effective.isEmpty()) {
                for (PermissionAttachmentInfo attach : effective) {
-                    // Ignore all "false" permissions
-                    if (!attach.getValue()) {
-                        continue;
-                    }
                    String permStr = attach.getPermission();
                    if (permStr.startsWith(stubPlus)) {
                        hasAny = true;
@@ -309,21 +302,18 @@ public class BukkitPlayer extends PlotPlayer<Player> {
    @Override
    public void playMusic(final @NonNull Location location, final @NonNull ItemType id) {
        if (id == ItemTypes.AIR) {
-            if (PlotSquared.platform().serverVersion()[1] >= 19) {
-                player.stopSound(SoundCategory.MUSIC);
-                return;
+            // Let's just stop all the discs because why not?
+            for (final Sound sound : Arrays.stream(Sound.values())
+                    .filter(sound -> sound.name().contains("DISC")).toList()) {
+                player.stopSound(sound);
            }
-            // 1.18 and downwards require a specific Sound to stop (even tho the packet does not??)
-            for (final Sound sound : Sound.values()) {
-                if (sound.name().startsWith("MUSIC_DISC")) {
-                    this.player.stopSound(sound, SoundCategory.MUSIC);
-                }
-            }
-            return;
+            // this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, Material.AIR);
+        } else {
+            // this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, id.to(Material.class));
+            this.player.playSound(BukkitUtil.adapt(location),
+                    Sound.valueOf(BukkitAdapter.adapt(id).name()), Float.MAX_VALUE, 1f
+            );
        }
-        this.player.playSound(BukkitUtil.adapt(location), Sound.valueOf(BukkitAdapter.adapt(id).name()),
-                SoundCategory.MUSIC, 1f, 1f
-        );
    }

    @SuppressWarnings("deprecation") // Needed for Spigot compatibility
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java
@@ -270,7 +270,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
            if (getChunkObject() instanceof Chunk chunkObject) {
                existing = chunkObject.getBlock(x & 15, y, z & 15);
            } else {
-                existing = getBukkitWorld().getBlockAt(x, y, z);
+                 existing = getBukkitWorld().getBlockAt(x, y, z);
            }
            final BlockState existingBaseBlock = BukkitAdapter.adapt(existing.getBlockData());
            if (BukkitBlockUtil.get(existing).equals(existingBaseBlock) && existing.getBlockData().matches(blockData)) {
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java
@@ -62,6 +62,7 @@ public class GenChunk extends ZeroedDelegateScopedQueueCoordinator {
    /**
     * @param minY minimum world Y, inclusive
     * @param maxY maximum world Y, inclusive
+     *
     * @since 6.6.0
     */
    public GenChunk(int minY, int maxY) {
@@ -109,9 +110,9 @@ public class GenChunk extends ZeroedDelegateScopedQueueCoordinator {
     */
    public void setChunk(@NonNull ChunkWrapper wrap) {
        chunk = null;
-        world = wrap.world();
-        chunkX = wrap.x();
-        chunkZ = wrap.z();
+        world = wrap.world;
+        chunkX = wrap.x;
+        chunkZ = wrap.z;
    }

    @Override
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java
@@ -18,8 +18,6 @@
 */
 package com.plotsquared.bukkit.schematic;

-import com.destroystokyo.paper.profile.PlayerProfile;
-import com.destroystokyo.paper.profile.ProfileProperty;
 import com.plotsquared.bukkit.util.BukkitUtil;
 import com.sk89q.jnbt.ByteTag;
 import com.sk89q.jnbt.CompoundTag;
@@ -30,20 +28,13 @@ import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.blocks.BaseItemStack;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.world.item.ItemType;
-import io.papermc.lib.PaperLib;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.DyeColor;
 import org.bukkit.World;
-import org.bukkit.block.Banner;
 import org.bukkit.block.Block;
 import org.bukkit.block.Container;
 import org.bukkit.block.Sign;
 import org.bukkit.block.Skull;
-import org.bukkit.block.banner.Pattern;
-import org.bukkit.block.banner.PatternType;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
@@ -54,15 +45,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Objects;
-import java.util.UUID;

 public class StateWrapper {

-    public CompoundTag tag;
-
-    private boolean paperErrorTextureSent = false;
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + StateWrapper.class.getSimpleName());
+    public org.bukkit.block.BlockState state = null;
+    public CompoundTag tag = null;

    public StateWrapper(CompoundTag tag) {
        this.tag = tag;
@@ -240,64 +227,15 @@ public class StateWrapper {
                        return true;
                    }
                    String player = skullOwner.getString("Name");
-
-                    if (player != null && !player.isEmpty()) {
-                        try {
-                            skull.setOwningPlayer(Bukkit.getOfflinePlayer(player));
-                            skull.update(true);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                        return true;
-                    }
-
-                    final CompoundTag properties = (CompoundTag) skullOwner.getValue().get("Properties");
-                    if (properties == null) {
+                    if (player == null || player.isEmpty()) {
                        return false;
                    }
-                    final ListTag textures = properties.getListTag("textures");
-                    if (textures.getValue().isEmpty()) {
-                        return false;
+                    try {
+                        skull.setOwningPlayer(Bukkit.getOfflinePlayer(player));
+                        skull.update(true);
+                    } catch (Exception e) {
+                        e.printStackTrace();
                    }
-                    final CompoundTag textureCompound = (CompoundTag) textures.getValue().get(0);
-                    if (textureCompound == null) {
-                        return false;
-                    }
-                    String textureValue = textureCompound.getString("Value");
-                    if (textureValue == null) {
-                        return false;
-                    }
-                    if (!PaperLib.isPaper()) {
-                        if (!paperErrorTextureSent) {
-                            paperErrorTextureSent = true;
-                            LOGGER.error("Failed to populate skull data in your road schematic - This is a Spigot limitation.");
-                        }
-                        return false;
-                    }
-                    final PlayerProfile profile = Bukkit.createProfile(UUID.randomUUID());
-                    profile.setProperty(new ProfileProperty("textures", textureValue));
-                    skull.setPlayerProfile(profile);
-                    skull.update(true);
-                    return true;
-
-                }
-                return false;
-            }
-            case "banner" -> {
-                if (state instanceof Banner banner) {
-                    List<Tag> patterns = this.tag.getListTag("Patterns").getValue();
-                    if (patterns == null || patterns.isEmpty()) {
-                        return false;
-                    }
-                    banner.setPatterns(patterns.stream().map(t -> (CompoundTag) t).map(compoundTag -> {
-                        DyeColor color = DyeColor.getByWoolData((byte) compoundTag.getInt("Color"));
-                        PatternType patternType = PatternType.getByIdentifier(compoundTag.getString("Pattern"));
-                        if (color == null || patternType == null) {
-                            return null;
-                        }
-                        return new Pattern(color, patternType);
-                    }).filter(Objects::nonNull).toList());
-                    banner.update(true);
                    return true;
                }
                return false;
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java
@@ -44,7 +44,6 @@ import java.util.stream.IntStream;
@Singleton
 public class BukkitInventoryUtil extends InventoryUtil {

-    @SuppressWarnings("deprecation") // Paper deprecation
    private static @Nullable ItemStack getItem(PlotItemStack item) {
        if (item == null) {
            return null;
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java
@@ -70,7 +70,7 @@ public class BukkitRegionManager extends RegionManager {
    @Inject
    public BukkitRegionManager(
            @NonNull WorldUtil worldUtil, @NonNull GlobalBlockQueue blockQueue, @NonNull
-    ProgressSubscriberFactory subscriberFactory
+            ProgressSubscriberFactory subscriberFactory
    ) {
        super(worldUtil, blockQueue, subscriberFactory);
        this.blockQueue = blockQueue;
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java
@@ -67,7 +67,6 @@ public class BukkitSetupUtils extends SetupUtils {
        this.worldFile = worldFile;
    }

-    @SuppressWarnings("deprecation") // Paper deprecation
    @Override
    public void updateGenerators(final boolean force) {
        if (loaded && !SetupUtils.generators.isEmpty() && !force) {
@@ -125,7 +124,7 @@ public class BukkitSetupUtils extends SetupUtils {
    public String setupWorld(PlotAreaBuilder builder) {
        this.updateGenerators(false);
        ConfigurationNode[] steps = builder.settingsNodesWrapper() == null ?
-                new ConfigurationNode[0] : builder.settingsNodesWrapper().settingsNodes();
+                new ConfigurationNode[0] : builder.settingsNodesWrapper().getSettingsNodes();
        String world = builder.worldName();
        PlotAreaType type = builder.plotAreaType();
        String worldPath = "worlds." + builder.worldName();
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/TranslationUpdateManager.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/TranslationUpdateManager.java
@@ -28,58 +28,24 @@ import java.nio.file.Paths;
 import java.util.stream.Stream;

 /**
- * This is a helper class which replaces older syntax no longer supported by MiniMessage with replacements in messages_%.json.
+ * This is a helper class which replaces occurrences of 'suggest_command' with 'run_command' in messages_%.json.
 * MiniMessage changed the syntax between major releases. To warrant a smooth upgrade, we attempt to replace any occurrences
 * while loading PlotSquared.
 *
- * @since 7.0.0
+ * @since TODO
 */
@NotPublic
 public class TranslationUpdateManager {

    public static void upgradeTranslationFile() throws IOException {
-        String suggestCommand = "suggest_command";
-        String suggestCommandReplacement = "run_command";
-        String minHeight = "minHeight";
-        String minheightReplacement = "minheight";
-        String maxHeight = "maxHeight";
-        String maxheightReplacement = "maxheight";
-        String usedGrants = "usedGrants";
-        String usedGrantsReplacement = "used_grants";
-        String remainingGrants = "remainingGrants";
-        String remainingGrantsReplacement = "remaining_grants";
-        String minimumRadius = "minimumRadius";
-        String minimumRadiusReplacement = "minimum_radius";
-        String maximumMoves = "maximumMoves";
-        String maximumMovesReplacement = "maximum_moves";
-        String userMove = "userMove";
-        String userMoveReplacement = "user_move";
-
-        // tag opening / closing characters are important, as the locale keys exist as well, which should not be replaced
-        String listInfoUnknown = "<info.unknown>";
-        String listInfoUnknownReplacement = "<unknown>";
-        String listInfoServer = "<info.server>";
-        String listInfoServerReplacement = "<server>";
-        String listInfoEveryone = "<info.everyone>";
-        String listInfoEveryoneReplacement = "<everyone>";
+        String searchText = "suggest_command";
+        String replacementText = "run_command";

        try (Stream<Path> paths = Files.walk(Paths.get(PlotSquared.platform().getDirectory().toPath().resolve("lang").toUri()))) {
            paths
                    .filter(Files::isRegularFile)
                    .filter(p -> p.getFileName().toString().matches("messages_[a-z]{2}\\.json"))
-                    .forEach(p -> {
-                        replaceInFile(p, suggestCommand, suggestCommandReplacement);
-                        replaceInFile(p, minHeight, minheightReplacement);
-                        replaceInFile(p, maxHeight, maxheightReplacement);
-                        replaceInFile(p, usedGrants, usedGrantsReplacement);
-                        replaceInFile(p, remainingGrants, remainingGrantsReplacement);
-                        replaceInFile(p, minimumRadius, minimumRadiusReplacement);
-                        replaceInFile(p, maximumMoves, maximumMovesReplacement);
-                        replaceInFile(p, userMove, userMoveReplacement);
-                        replaceInFile(p, listInfoUnknown, listInfoUnknownReplacement);
-                        replaceInFile(p, listInfoServer, listInfoServerReplacement);
-                        replaceInFile(p, listInfoEveryone, listInfoEveryoneReplacement);
-                    });
+                    .forEach(p -> replaceInFile(p, searchText, replacementText));
        }
    }

@@ -94,5 +60,4 @@ public class TranslationUpdateManager {
            e.printStackTrace();
        }
    }
-
 }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java
@@ -35,7 +35,7 @@ import org.bukkit.scheduler.BukkitTask;
 import javax.net.ssl.HttpsURLConnection;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.URI;
+import java.net.URL;

 public class UpdateUtility implements Listener {

@@ -54,14 +54,12 @@ public class UpdateUtility implements Listener {
        internalVersion = PlotSquared.get().getVersion();
    }

-    @SuppressWarnings({"deprecation", "DefaultCharset"})
-    // Suppress Json deprecation, we can't use features from gson 2.8.1 and newer yet
+    @SuppressWarnings({"deprecation", "DefaultCharset"}) // Suppress Json deprecation, we can't use features from gson 2.8.1 and newer yet
    public void updateChecker() {
        task = Bukkit.getScheduler().runTaskTimerAsynchronously(this.javaPlugin, () -> {
            try {
-                HttpsURLConnection connection = (HttpsURLConnection) URI.create(
-                        "https://api.spigotmc.org/simple/0.2/index.php?action=getResource&id=77506")
-                        .toURL()
+                HttpsURLConnection connection = (HttpsURLConnection) new URL(
+                        "https://api.spigotmc.org/simple/0.1/index.php?action=getResource&id=77506")
                        .openConnection();
                connection.setRequestMethod("GET");
                JsonObject result = new JsonParser()
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/fawe/FaweRegionManager.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/fawe/FaweRegionManager.java
@@ -37,9 +37,7 @@ import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.world.biome.BiomeType;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import org.jetbrains.annotations.NotNull;

-import java.util.Objects;
 import java.util.Set;

 public class FaweRegionManager extends BukkitRegionManager {
@@ -61,10 +59,7 @@ public class FaweRegionManager extends BukkitRegionManager {
            @Nullable PlotPlayer<?> actor,
            @Nullable QueueCoordinator queue
    ) {
-        return delegate.setCuboids(
-                area, regions, blocks, minY, maxY,
-                Objects.requireNonNullElseGet(queue, area::getQueue).getCompleteTask()
-        );
+        return delegate.setCuboids(area, regions, blocks, minY, maxY, queue.getCompleteTask());
    }

    @Override
@@ -116,7 +111,7 @@ public class FaweRegionManager extends BukkitRegionManager {
    }

    @Override
-    public boolean regenerateRegion(final @NotNull Location pos1, final @NotNull Location pos2, boolean ignore, final Runnable whenDone) {
+    public boolean regenerateRegion(final Location pos1, final Location pos2, boolean ignore, final Runnable whenDone) {
        return delegate.regenerateRegion(pos1, pos2, ignore, whenDone);
    }

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SQLiteUUIDService.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SQLiteUUIDService.java
@@ -111,8 +111,8 @@ public class SQLiteUUIDService implements UUIDService, Consumer<List<UUIDMapping
        try (final PreparedStatement statement = getConnection()
                .prepareStatement("INSERT OR REPLACE INTO `usercache` (`uuid`, `username`) VALUES(?, ?)")) {
            for (final UUIDMapping mapping : uuidWrappers) {
-                statement.setString(1, mapping.uuid().toString());
-                statement.setString(2, mapping.username());
+                statement.setString(1, mapping.getUuid().toString());
+                statement.setString(2, mapping.getUsername());
                statement.executeUpdate();
            }
        } catch (SQLException e) {
--- a/Bukkit/src/main/resources/plugin.yml
+++ b/Bukkit/src/main/resources/plugin.yml
@@ -4,16 +4,16 @@ api-version: "1.13"
 version: "${version}"
 load: STARTUP
 description: "Easy, yet powerful Plot World generation and management."
-authors: [ Citymonstret, Empire92, MattBDev, dordsor21, NotMyFault, SirYwell ]
+authors: [Citymonstret, Empire92, MattBDev, dordsor21, NotMyFault, SirYwell]
 website: https://www.spigotmc.org/resources/77506/
-softdepend: [ Vault, PlaceholderAPI, Essentials, LuckPerms, BungeePerms, MVdWPlaceholderAPI ]
-loadbefore: [ MultiWorld, Multiverse-Core ]
-depend: [ WorldEdit ]
+softdepend: [Vault, PlaceholderAPI, Essentials, LuckPerms, BungeePerms, MVdWPlaceholderAPI]
+loadbefore: [MultiWorld, Multiverse-Core]
+depend: [WorldEdit]
 database: false
 commands:
  plots:
    description: Plot command.
-    aliases: [ p,plot,ps,plotsquared,p2,2,plotme ]
+    aliases: [p,plot,ps,plotsquared,p2,2,plotme]
    permission: plots.use
    permission-message: "You are lacking the permission node 'plots.use'"
 permissions:
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+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
+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.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
--- a/Core/build.gradle.kts
+++ b/Core/build.gradle.kts
@@ -2,18 +2,23 @@ import java.time.format.DateTimeFormatter

 dependencies {
    // Expected everywhere.
-    compileOnlyApi(libs.checkerqual)
+    compileOnlyApi("org.checkerframework:checker-qual")

    // Minecraft expectations
-    compileOnlyApi(libs.gson)
-    compileOnly(libs.guava)
+    compileOnlyApi("com.google.code.gson:gson")
+    compileOnly("com.google.guava:guava")

    // Platform expectations
-    compileOnlyApi(libs.snakeyaml)
+    compileOnlyApi("org.yaml:snakeyaml")

    // Adventure
-    api(libs.adventureApi)
-    api(libs.adventureMiniMessage)
+    api("net.kyori:adventure-api")
+    api("net.kyori:adventure-text-minimessage")
+
+    // Cloud
+    api(libs.cloudServices)
+    api(libs.cloudCore)
+    api(libs.cloudAnnotations)

    // Guice
    api(libs.guice) {
@@ -31,19 +36,18 @@ dependencies {
        exclude(group = "dummypermscompat")
    }
    testImplementation(libs.worldeditCore)
-    compileOnly(libs.faweBukkit) { isTransitive = false }
-    testImplementation(libs.faweCore) { isTransitive = false }
+    compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core") { isTransitive = false }
+    testImplementation("com.fastasyncworldedit:FastAsyncWorldEdit-Core") { isTransitive = false }

    // Logging
-    compileOnlyApi(libs.log4j)
+    compileOnlyApi("org.apache.logging.log4j:log4j-api")

    // Other libraries
    api(libs.prtree)
    api(libs.aopalliance)
-    api(libs.cloudServices)
    api(libs.arkitektonika)
-    api(libs.paster)
-    api(libs.informativeAnnotations)
+    api("com.intellectualsites.paster:Paster")
+    api("com.intellectualsites.informative-annotations:informative-annotations")
 }

 tasks.processResources {
@@ -57,8 +61,8 @@ tasks.processResources {

    doLast {
        copy {
-            from(layout.buildDirectory.file("$rootDir/LICENSE"))
-            into(layout.buildDirectory.dir("resources/main"))
+            from(File("$rootDir/LICENSE"))
+            into("$buildDir/resources/main/")
        }
    }
 }
@@ -68,10 +72,11 @@ tasks {
        val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
        val opt = options as StandardJavadocDocletOptions
        opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString())
-        opt.links("https://jd.advntr.dev/api/4.14.0/")
-        opt.links("https://jd.advntr.dev/text-minimessage/4.14.0/")
+        opt.links("https://jd.adventure.kyori.net/api/4.12.0/")
+        opt.links("https://jd.adventure.kyori.net/text-minimessage/4.12.0/")
        opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
-      //  opt.links("https://checkerframework.org/api/")
+        opt.links("https://checkerframework.org/api/")
+        opt.links("https://javadoc.io/doc/com.intellectualsites.informative-annotations/informative-annotations/latest/")
        opt.isLinkSource = true
        opt.bottom(File("$rootDir/javadocfooter.html").readText())
        opt.isUse = true
--- a/Core/src/main/java/com/plotsquared/core/PlotSquared.java
+++ b/Core/src/main/java/com/plotsquared/core/PlotSquared.java
@@ -84,7 +84,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.net.URI;
+import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Files;
@@ -210,10 +210,9 @@ public class PlotSquared {
            try {
                URL logurl = PlotSquared.class.getProtectionDomain().getCodeSource().getLocation();
                this.jarFile = new File(
-                        URI.create(
-                                logurl.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file"))
-                                .getPath());
-            } catch (URISyntaxException | SecurityException e) {
+                        new URL(logurl.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file"))
+                                .toURI().getPath());
+            } catch (MalformedURLException | URISyntaxException | SecurityException e) {
                e.printStackTrace();
                this.jarFile = new File(this.platform.getDirectory().getParentFile(), "PlotSquared.jar");
                if (!this.jarFile.exists()) {
@@ -271,11 +270,7 @@ public class PlotSquared {
            captionMap = this.captionLoader.loadAll(this.platform.getDirectory().toPath().resolve("lang"));
        } else {
            String fileName = "messages_" + Settings.Enabled_Components.DEFAULT_LOCALE + ".json";
-            captionMap = this.captionLoader.loadOrCreateSingle(this.platform
-                    .getDirectory()
-                    .toPath()
-                    .resolve("lang")
-                    .resolve(fileName));
+            captionMap = this.captionLoader.loadOrCreateSingle(this.platform.getDirectory().toPath().resolve("lang").resolve(fileName));
        }
        this.captionMaps.put(TranslatableCaption.DEFAULT_NAMESPACE, captionMap);
        LOGGER.info(
@@ -1016,7 +1011,7 @@ public class PlotSquared {

    /**
     * Setup the configuration for a plot world based on world arguments.
-     * <p>
+     *
     *
     * <i>e.g. /mv create &lt;world&gt; normal -g PlotSquared:&lt;args&gt;</i>
     *
@@ -1282,7 +1277,7 @@ public class PlotSquared {
    }

    /**
-     * Set up the database connection.
+     * Setup the database connection.
     */
    public void setupDatabase() {
        try {
--- a/Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java
+++ b/Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java
@@ -136,9 +136,13 @@ public class SimpleBackupManager implements BackupManager {
        return this.backupLimit;
    }

-    private record PlotCacheKey(
-            Plot plot
-    ) {
+    private static final class PlotCacheKey {
+
+        private final Plot plot;
+
+        private PlotCacheKey(Plot plot) {
+            this.plot = plot;
+        }

        @Override
        public boolean equals(final Object o) {
--- a/Core/src/main/java/com/plotsquared/core/command/Add.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Add.java
@@ -1,183 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.core.command;
-
-import com.google.inject.Inject;
-import com.plotsquared.core.PlotSquared;
-import com.plotsquared.core.configuration.Settings;
-import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.database.DBFunc;
-import com.plotsquared.core.permissions.Permission;
-import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.Plot;
-import com.plotsquared.core.util.EventDispatcher;
-import com.plotsquared.core.util.PlayerManager;
-import com.plotsquared.core.util.TabCompletions;
-import com.plotsquared.core.util.task.RunnableVal2;
-import com.plotsquared.core.util.task.RunnableVal3;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeoutException;
-
-@CommandDeclaration(command = "add",
-        usage = "/plot add <player | *>",
-        category = CommandCategory.SETTINGS,
-        permission = "plots.add",
-        requiredType = RequiredType.PLAYER)
-public class Add extends Command {
-
-    private final EventDispatcher eventDispatcher;
-
-    @Inject
-    public Add(final @NonNull EventDispatcher eventDispatcher) {
-        super(MainCommand.getInstance(), true);
-        this.eventDispatcher = eventDispatcher;
-    }
-
-    @Override
-    public CompletableFuture<Boolean> execute(
-            final PlotPlayer<?> player,
-            String[] args,
-            RunnableVal3<Command, Runnable, Runnable> confirm,
-            RunnableVal2<Command, CommandResult> whenDone
-    ) throws CommandException {
-        final Plot plot = check(player.getCurrentPlot(), TranslatableCaption.of("errors.not_in_plot"));
-        checkTrue(plot.hasOwner(), TranslatableCaption.of("info.plot_unowned"));
-        checkTrue(
-                plot.isOwner(player.getUUID()) || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_TRUST),
-                TranslatableCaption.of("permission.no_plot_perms")
-        );
-        checkTrue(
-                args.length == 1,
-                TranslatableCaption.of("commandconfig.command_syntax"),
-                TagResolver.resolver("value", Tag.inserting(Component.text("/plot add <player | *>")))
-        );
-        final CompletableFuture<Boolean> future = new CompletableFuture<>();
-        PlayerManager.getUUIDsFromString(args[0], (uuids, throwable) -> {
-            if (throwable != null) {
-                if (throwable instanceof TimeoutException) {
-                    player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout"));
-                } else {
-                    player.sendMessage(
-                            TranslatableCaption.of("errors.invalid_player"),
-                            TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
-                    );
-                }
-                future.completeExceptionally(throwable);
-                return;
-            } else {
-                try {
-                    checkTrue(!uuids.isEmpty(), TranslatableCaption.of("errors.invalid_player"),
-                            TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
-                    );
-                    Iterator<UUID> iterator = uuids.iterator();
-                    int size = plot.getTrusted().size() + plot.getMembers().size();
-                    while (iterator.hasNext()) {
-                        UUID uuid = iterator.next();
-                        if (uuid == DBFunc.EVERYONE && !(player.hasPermission(Permission.PERMISSION_TRUST_EVERYONE) || player.hasPermission(
-                                Permission.PERMISSION_ADMIN_COMMAND_TRUST))) {
-                            player.sendMessage(
-                                    TranslatableCaption.of("errors.invalid_player"),
-                                    PlotSquared
-                                            .platform()
-                                            .playerManager()
-                                            .getUsernameCaption(uuid)
-                                            .thenApply(caption -> TagResolver.resolver(
-                                                    "value",
-                                                    Tag.inserting(caption.toComponent(player))
-                                            ))
-                            );
-                            iterator.remove();
-                            continue;
-                        }
-                        if (plot.isOwner(uuid)) {
-                            player.sendMessage(
-                                    TranslatableCaption.of("member.already_added"),
-                                    PlotSquared.platform().playerManager().getUsernameCaption(uuid)
-                                            .thenApply(caption -> TagResolver.resolver(
-                                                    "player",
-                                                    Tag.inserting(caption.toComponent(player))
-                                            ))
-                            );
-                            iterator.remove();
-                            continue;
-                        }
-                        if (plot.getMembers().contains(uuid)) {
-                            player.sendMessage(
-                                    TranslatableCaption.of("member.already_added"),
-                                    PlotSquared.platform().playerManager().getUsernameCaption(uuid)
-                                            .thenApply(caption -> TagResolver.resolver(
-                                                    "player",
-                                                    Tag.inserting(caption.toComponent(player))
-                                            ))
-                            );
-                            iterator.remove();
-                            continue;
-                        }
-                        size += plot.getTrusted().contains(uuid) ? 0 : 1;
-                    }
-                    checkTrue(!uuids.isEmpty(), null);
-                    int localAddSize = plot.getMembers().size();
-                    int maxAddSize = player.hasPermissionRange(Permission.PERMISSION_ADD, Settings.Limit.MAX_PLOTS);
-                    if (localAddSize >= maxAddSize) {
-                        player.sendMessage(
-                                TranslatableCaption.of("members.plot_max_members_added"),
-                                TagResolver.resolver("amount", Tag.inserting(Component.text(localAddSize)))
-                        );
-                        return;
-                    }
-                    // Success
-                    confirm.run(this, () -> {
-                        for (UUID uuid : uuids) {
-                            if (uuid != DBFunc.EVERYONE) {
-                                if (!plot.removeTrusted(uuid)) {
-                                    if (plot.getDenied().contains(uuid)) {
-                                        plot.removeDenied(uuid);
-                                    }
-                                }
-                            }
-                            plot.addMember(uuid);
-                            this.eventDispatcher.callMember(player, plot, uuid, true);
-                            player.sendMessage(TranslatableCaption.of("member.member_added"));
-                        }
-                    }, null);
-                } catch (final Throwable exception) {
-                    future.completeExceptionally(exception);
-                    return;
-                }
-            }
-            future.complete(true);
-        });
-        return future;
-    }
-
-    @Override
-    public Collection<Command> tab(final PlotPlayer<?> player, final String[] args, final boolean space) {
-        return TabCompletions.completePlayers(player, String.join(",", args).trim(), Collections.emptyList());
-    }
-
-}
--- a/Core/src/main/java/com/plotsquared/core/command/Alias.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Alias.java
@@ -1,210 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.core.command;
-
-import com.plotsquared.core.PlotSquared;
-import com.plotsquared.core.configuration.Settings;
-import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.location.Location;
-import com.plotsquared.core.permissions.Permission;
-import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.Plot;
-import com.plotsquared.core.util.MathMan;
-import com.plotsquared.core.util.query.PlotQuery;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.TimeoutException;
-
-@CommandDeclaration(command = "alias",
-        permission = "plots.alias",
-        usage = "/plot alias <set | remove> <alias>",
-        aliases = {"setalias", "sa", "name", "rename", "setname", "seta", "nameplot"},
-        category = CommandCategory.SETTINGS,
-        requiredType = RequiredType.PLAYER)
-public class Alias extends SubCommand {
-
-    private static final Command SET_COMMAND = new Command(null, false, "set", null, RequiredType.NONE, null) {
-    };
-    private static final Command REMOVE_COMMAND = new Command(null, false, "remove", null, RequiredType.NONE, null) {
-    };
-
-    @Override
-    public boolean onCommand(PlotPlayer<?> player, String[] args) {
-
-        if (args.length == 0) {
-            sendUsage(player);
-            return false;
-        }
-
-        Location location = player.getLocation();
-        Plot plot = location.getPlotAbs();
-        if (plot == null) {
-            player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
-            return false;
-        }
-
-        if (!plot.hasOwner()) {
-            player.sendMessage(TranslatableCaption.of("working.plot_not_claimed"));
-            return false;
-        }
-
-        boolean result = false;
-
-        boolean owner = plot.isOwner(player.getUUID());
-        boolean permission;
-        boolean admin;
-        switch (args[0].toLowerCase()) {
-            case "set" -> {
-                if (args.length != 2) {
-                    sendUsage(player);
-                    return false;
-                }
-                permission = isPermitted(player, Permission.PERMISSION_ALIAS_SET);
-                admin = isPermitted(player, Permission.PERMISSION_ADMIN_ALIAS_SET);
-                if (!admin && !owner) {
-                    player.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
-                    return false;
-                }
-                if (permission) { // is either admin or owner
-                    setAlias(player, plot, args[1]);
-                    return true;
-                } else {
-                    player.sendMessage(
-                            TranslatableCaption.of("permission.no_permission"),
-                            TagResolver.resolver(
-                                    "node",
-                                    Tag.inserting(Permission.PERMISSION_ALIAS_SET)
-                            )
-                    );
-                }
-            }
-            case "remove" -> {
-                permission = isPermitted(player, Permission.PERMISSION_ALIAS_REMOVE);
-                admin = isPermitted(player, Permission.PERMISSION_ADMIN_ALIAS_REMOVE);
-                if (!admin && !owner) {
-                    player.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
-                    return false;
-                }
-                if (permission) {
-                    result = removeAlias(player, plot);
-                } else {
-                    player.sendMessage(
-                            TranslatableCaption.of("permission.no_permission"),
-                            TagResolver.resolver(
-                                    "node",
-                                    Tag.inserting(Permission.PERMISSION_ALIAS_REMOVE)
-                            )
-                    );
-                }
-            }
-            default -> {
-                sendUsage(player);
-                result = false;
-            }
-        }
-
-        return result;
-    }
-
-    @Override
-    public Collection<Command> tab(PlotPlayer<?> player, String[] args, boolean space) {
-        final List<Command> commands = new ArrayList<>(2);
-        if (args.length == 1) {
-            if ("set".startsWith(args[0])) {
-                commands.add(SET_COMMAND);
-            }
-            if ("remove".startsWith(args[0])) {
-                commands.add(REMOVE_COMMAND);
-            }
-            return commands;
-        }
-        return Collections.emptySet();
-    }
-
-    private void setAlias(PlotPlayer<?> player, Plot plot, String alias) {
-        if (alias.isEmpty()) {
-            sendUsage(player);
-        } else if (alias.length() >= 50) {
-            player.sendMessage(TranslatableCaption.of("alias.alias_too_long"));
-        } else if (MathMan.isInteger(alias)) {
-            player.sendMessage(TranslatableCaption.of("flag.not_valid_value")); // TODO this is obviously wrong
-        } else {
-            if (PlotQuery.newQuery().inArea(plot.getArea())
-                    .withAlias(alias)
-                    .anyMatch()) {
-                player.sendMessage(
-                        TranslatableCaption.of("alias.alias_is_taken"),
-                        TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
-                );
-                return;
-            }
-            if (Settings.UUID.OFFLINE) {
-                plot.setAlias(alias);
-                player.sendMessage(
-                        TranslatableCaption.of("alias.alias_set_to"),
-                        TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
-                );
-                return;
-            }
-            PlotSquared.get().getImpromptuUUIDPipeline().getSingle(alias, ((uuid, throwable) -> {
-                if (throwable instanceof TimeoutException) {
-                    player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout"));
-                } else if (uuid != null) {
-                    player.sendMessage(
-                            TranslatableCaption.of("alias.alias_is_taken"),
-                            TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
-                    );
-                } else {
-                    plot.setAlias(alias);
-                    player.sendMessage(
-                            TranslatableCaption.of("alias.alias_set_to"),
-                            TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
-                    );
-                }
-            }));
-        }
-    }
-
-    private boolean removeAlias(PlotPlayer<?> player, Plot plot) {
-        String alias = plot.getAlias();
-        if (!plot.getAlias().isEmpty()) {
-            player.sendMessage(
-                    TranslatableCaption.of("alias.alias_removed"),
-                    TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
-            );
-        } else {
-            player.sendMessage(
-                    TranslatableCaption.of("alias.no_alias_set")
-            );
-        }
-        plot.setAlias(null);
-        return true;
-    }
-
-    private boolean isPermitted(PlotPlayer<?> player, Permission permission) {
-        return player.hasPermission(permission);
-    }
-
-}
--- a/Core/src/main/java/com/plotsquared/core/command/Auto.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Auto.java
@@ -35,7 +35,6 @@ import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.world.PlotAreaManager;
-import com.plotsquared.core.services.plots.AutoQuery;
 import com.plotsquared.core.services.plots.AutoService;
 import com.plotsquared.core.util.EconHandler;
 import com.plotsquared.core.util.EventDispatcher;
@@ -131,8 +130,8 @@ public class Auto extends SubCommand {
                        player.sendMessage(
                                TranslatableCaption.of("economy.removed_granted_plot"),
                                TagResolver.builder()
-                                        .tag("used_grants", Tag.inserting(Component.text(grantedPlots - left)))
-                                        .tag("remaining_grants", Tag.inserting(Component.text(left)))
+                                        .tag("usedGrants", Tag.inserting(Component.text(grantedPlots - left)))
+                                        .tag("remainingGrants", Tag.inserting(Component.text(left)))
                                        .build()
                        );
                    }
@@ -294,15 +293,12 @@ public class Auto extends SubCommand {
                return true;
            }
        }
-        if (this.econHandler != null && plotarea.useEconomy() && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON)) {
+        if (this.econHandler != null && plotarea.useEconomy()) {
            PlotExpression costExp = plotarea.getPrices().get("claim");
-            PlotExpression mergeCostExp = plotarea.getPrices().get("merge");
-            int size = sizeX * sizeZ;
-            double mergeCost = size <= 1 || mergeCostExp == null ? 0d : mergeCostExp.evaluate(size);
            double cost = costExp.evaluate(Settings.Limit.GLOBAL ?
                    player.getPlotCount() :
                    player.getPlotCount(plotarea.getWorldName()));
-            cost = size * cost + mergeCost;
+            cost = (sizeX * sizeZ) * cost;
            if (cost > 0d) {
                if (!this.econHandler.isSupported()) {
                    player.sendMessage(TranslatableCaption.of("economy.vault_or_consumer_null"));
@@ -330,7 +326,7 @@ public class Auto extends SubCommand {
        }

        List<Plot> plots = this.servicePipeline
-                .pump(new AutoQuery(player, null, sizeX, sizeZ, plotarea))
+                .pump(new AutoService.AutoQuery(player, null, sizeX, sizeZ, plotarea))
                .through(AutoService.class)
                .getResult();

--- a/Core/src/main/java/com/plotsquared/core/command/Buy.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Buy.java
@@ -21,9 +21,8 @@ package com.plotsquared.core.command;
 import com.google.inject.Inject;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.events.PlayerBuyPlotEvent;
+import com.plotsquared.core.events.PlotFlagRemoveEvent;
 import com.plotsquared.core.events.Result;
-import com.plotsquared.core.player.OfflinePlotPlayer;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
@@ -89,30 +88,22 @@ public class Buy extends Command {
                TranslatableCaption.of("permission.cant_claim_more_plots"),
                TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
        );
-        double priceFlag = plot.getFlag(PriceFlag.class);
-        if (priceFlag <= 0) {
+        double price = plot.getFlag(PriceFlag.class);
+        if (price <= 0) {
            throw new CommandException(TranslatableCaption.of("economy.not_for_sale"));
        }
        checkTrue(
                this.econHandler.isSupported(),
                TranslatableCaption.of("economy.vault_or_consumer_null")
        );
-
-        PlayerBuyPlotEvent event = this.eventDispatcher.callPlayerBuyPlot(player, plot, priceFlag);
-        if (event.getEventResult() == Result.DENY) {
-            throw new CommandException(TranslatableCaption.of("economy.cannot_buy_blocked"));
-        }
-
-        double price = event.getEventResult() == Result.FORCE ? 0 : event.price();
-        if (this.econHandler.getMoney(player) < price) {
-            throw new CommandException(
-                    TranslatableCaption.of("economy.cannot_afford_plot"),
-                    TagResolver.builder()
-                            .tag("money", Tag.inserting(Component.text(this.econHandler.format(price))))
-                            .tag("balance", Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(player)))))
-                            .build()
-            );
-        }
+        checkTrue(
+                this.econHandler.getMoney(player) >= price,
+                TranslatableCaption.of("economy.cannot_afford_plot"),
+                TagResolver.builder()
+                        .tag("money", Tag.inserting(Component.text(this.econHandler.format(price))))
+                        .tag("balance", Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(player)))))
+                        .build()
+        );
        this.econHandler.withdrawMoney(player, price);
        // Failure
        // Success
@@ -122,8 +113,7 @@ public class Buy extends Command {
                    TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
            );

-            OfflinePlotPlayer previousOwner = PlotSquared.platform().playerManager().getOfflinePlayer(plot.getOwnerAbs());
-            this.econHandler.depositMoney(previousOwner, price);
+            this.econHandler.depositMoney(PlotSquared.platform().playerManager().getOfflinePlayer(plot.getOwnerAbs()), price);

            PlotPlayer<?> owner = PlotSquared.platform().playerManager().getPlayerIfExists(plot.getOwnerAbs());
            if (owner != null) {
@@ -137,8 +127,9 @@ public class Buy extends Command {
                );
            }
            PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(PriceFlag.class);
-            if (this.eventDispatcher.callFlagRemove(plotFlag, plot).getEventResult() != Result.DENY) {
-                plot.removeFlag(plotFlag);
+            PlotFlagRemoveEvent event = this.eventDispatcher.callFlagRemove(plotFlag, plot);
+            if (event.getEventResult() != Result.DENY) {
+                plot.removeFlag(event.getFlag());
            }
            plot.setOwner(player.getUUID());
            plot.getPlotModificationManager().setSign(player.getName());
@@ -146,7 +137,6 @@ public class Buy extends Command {
                    TranslatableCaption.of("working.claimed"),
                    TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
            );
-            this.eventDispatcher.callPostPlayerBuyPlot(player, previousOwner, plot, price);
            whenDone.run(Buy.this, CommandResult.SUCCESS);
        }, () -> {
            this.econHandler.depositMoney(player, price);
--- a/Core/src/main/java/com/plotsquared/core/command/Clear.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Clear.java
@@ -107,36 +107,38 @@ public class Clear extends Command {
            }
            BackupManager.backup(player, plot, () -> {
                final long start = System.currentTimeMillis();
-                boolean result = plot.getPlotModificationManager().clear(true, false, player, () -> TaskManager.runTask(() -> {
-                    plot.removeRunning();
-                    // If the state changes, then mark it as no longer done
-                    if (DoneFlag.isDone(plot)) {
-                        PlotFlag<?, ?> plotFlag =
-                                plot.getFlagContainer().getFlag(DoneFlag.class);
-                        PlotFlagRemoveEvent event = this.eventDispatcher
-                                .callFlagRemove(plotFlag, plot);
-                        if (event.getEventResult() != Result.DENY) {
-                            plot.removeFlag(event.getFlag());
+                boolean result = plot.getPlotModificationManager().clear(true, false, player, () -> {
+                    plot.getPlotModificationManager().unlink();
+                    TaskManager.runTask(() -> {
+                        plot.removeRunning();
+                        // If the state changes, then mark it as no longer done
+                        if (DoneFlag.isDone(plot)) {
+                            PlotFlag<?, ?> plotFlag =
+                                    plot.getFlagContainer().getFlag(DoneFlag.class);
+                            PlotFlagRemoveEvent event = this.eventDispatcher
+                                    .callFlagRemove(plotFlag, plot);
+                            if (event.getEventResult() != Result.DENY) {
+                                plot.removeFlag(event.getFlag());
+                            }
                        }
-                    }
-                    if (!plot.getFlag(AnalysisFlag.class).isEmpty()) {
-                        PlotFlag<?, ?> plotFlag =
-                                plot.getFlagContainer().getFlag(AnalysisFlag.class);
-                        PlotFlagRemoveEvent event = this.eventDispatcher
-                                .callFlagRemove(plotFlag, plot);
-                        if (event.getEventResult() != Result.DENY) {
-                            plot.removeFlag(event.getFlag());
+                        if (!plot.getFlag(AnalysisFlag.class).isEmpty()) {
+                            PlotFlag<?, ?> plotFlag =
+                                    plot.getFlagContainer().getFlag(AnalysisFlag.class);
+                            PlotFlagRemoveEvent event = this.eventDispatcher
+                                    .callFlagRemove(plotFlag, plot);
+                            if (event.getEventResult() != Result.DENY) {
+                                plot.removeFlag(event.getFlag());
+                            }
                        }
-                    }
-                    player.sendMessage(
-                            TranslatableCaption.of("working.clearing_done"),
-                            TagResolver.builder()
-                                    .tag("amount", Tag.inserting(Component.text(System.currentTimeMillis() - start)))
-                                    .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
-                                    .build()
-                    );
-                    this.eventDispatcher.callPostPlotClear(player, plot);
-                }));
+                        player.sendMessage(
+                                TranslatableCaption.of("working.clearing_done"),
+                                TagResolver.builder()
+                                        .tag("amount", Tag.inserting(Component.text(System.currentTimeMillis() - start)))
+                                        .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
+                                        .build()
+                        );
+                    });
+                });
                if (!result) {
                    player.sendMessage(TranslatableCaption.of("errors.wait_for_timer"));
                } else {
--- a/Core/src/main/java/com/plotsquared/core/command/Cluster.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Cluster.java
@@ -46,7 +46,6 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeoutException;
@@ -78,7 +77,8 @@ public class Cluster extends SubCommand {
        }
        String sub = args[0].toLowerCase();
        switch (sub) {
-            case "l", "list" -> {
+            case "l":
+            case "list": {
                if (!player.hasPermission(Permission.PERMISSION_CLUSTER_LIST)) {
                    player.sendMessage(
                            TranslatableCaption.of("permission.no_permission"),
@@ -133,7 +133,8 @@ public class Cluster extends SubCommand {
                }
                return true;
            }
-            case "c", "create" -> {
+            case "c":
+            case "create": {
                if (!player.hasPermission(Permission.PERMISSION_CLUSTER_CREATE)) {
                    player.sendMessage(
                            TranslatableCaption.of("permission.no_permission"),
@@ -268,7 +269,9 @@ public class Cluster extends SubCommand {
                );
                return true;
            }
-            case "disband", "del", "delete" -> {
+            case "disband":
+            case "del":
+            case "delete": {
                if (!player.hasPermission(Permission.PERMISSION_CLUSTER_DELETE)) {
                    player.sendMessage(
                            TranslatableCaption.of("permission.no_permission"),
@@ -327,7 +330,8 @@ public class Cluster extends SubCommand {
                ));
                return true;
            }
-            case "res", "resize" -> {
+            case "res":
+            case "resize": {
                if (!player.hasPermission(Permission.PERMISSION_CLUSTER_RESIZE)) {
                    player.sendMessage(
                            TranslatableCaption.of("permission.no_permission"),
@@ -448,7 +452,9 @@ public class Cluster extends SubCommand {
                player.sendMessage(TranslatableCaption.of("cluster.cluster_resized"));
                return true;
            }
-            case "add", "inv", "invite" -> {
+            case "add":
+            case "inv":
+            case "invite": {
                if (!player.hasPermission(Permission.PERMISSION_CLUSTER_INVITE)) {
                    player.sendMessage(
                            TranslatableCaption.of("permission.no_permission"),
@@ -517,7 +523,9 @@ public class Cluster extends SubCommand {
                        });
                return true;
            }
-            case "k", "remove", "kick" -> {
+            case "k":
+            case "remove":
+            case "kick": {
                if (!player.hasPermission(Permission.PERMISSION_CLUSTER_KICK)) {
                    player.sendMessage(
                            TranslatableCaption.of("permission.no_permission"),
@@ -597,7 +605,8 @@ public class Cluster extends SubCommand {
                        });
                return true;
            }
-            case "quit", "leave" -> {
+            case "quit":
+            case "leave": {
                if (!player.hasPermission(Permission.PERMISSION_CLUSTER_LEAVE)) {
                    player.sendMessage(
                            TranslatableCaption.of("permission.no_permission"),
@@ -658,7 +667,7 @@ public class Cluster extends SubCommand {
                removePlayerPlots(cluster, uuid, player.getLocation().getWorldName());
                return true;
            }
-            case "members" -> {
+            case "members": {
                if (!player.hasPermission(Permission.PERMISSION_CLUSTER_HELPERS)) {
                    player.sendMessage(
                            TranslatableCaption.of("permission.no_permission"),
@@ -719,7 +728,9 @@ public class Cluster extends SubCommand {
                        });
                return true;
            }
-            case "spawn", "home", "tp" -> {
+            case "spawn":
+            case "home":
+            case "tp": {
                if (!player.hasPermission(Permission.PERMISSION_CLUSTER_TP)) {
                    player.sendMessage(
                            TranslatableCaption.of("permission.no_permission"),
@@ -767,7 +778,10 @@ public class Cluster extends SubCommand {
                player.sendMessage(TranslatableCaption.of("cluster.cluster_teleporting"));
                return true;
            }
-            case "i", "info", "show", "information" -> {
+            case "i":
+            case "info":
+            case "show":
+            case "information": {
                if (!player.hasPermission(Permission.PERMISSION_CLUSTER_INFO)) {
                    player.sendMessage(
                            TranslatableCaption.of("permission.no_permission"),
@@ -814,7 +828,11 @@ public class Cluster extends SubCommand {
                                player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout"));
                            } else {
                                final String owner;
-                                owner = Objects.requireNonNullElse(username, "unknown");
+                                if (username == null) {
+                                    owner = "unknown";
+                                } else {
+                                    owner = username;
+                                }
                                String name = cluster.getName();
                                String size = (cluster.getP2().getX() - cluster.getP1().getX() + 1) + "x" + (
                                        cluster.getP2().getY() - cluster.getP1().getY() + 1);
@@ -832,7 +850,9 @@ public class Cluster extends SubCommand {
                        });
                return true;
            }
-            case "sh", "setspawn", "sethome" -> {
+            case "sh":
+            case "setspawn":
+            case "sethome": {
                if (!player.hasPermission(Permission.PERMISSION_CLUSTER_SETHOME)) {
                    player.sendMessage(
                            TranslatableCaption.of("permission.no_permission"),
--- a/Core/src/main/java/com/plotsquared/core/command/Command.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Command.java
@@ -559,10 +559,9 @@ public abstract class Command {

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

--- a/Core/src/main/java/com/plotsquared/core/command/CommandCategory.java
+++ b/Core/src/main/java/com/plotsquared/core/command/CommandCategory.java
@@ -25,7 +25,6 @@ import com.plotsquared.core.player.PlotPlayer;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.jetbrains.annotations.NotNull;

 /**
 * CommandCategory.
@@ -83,7 +82,7 @@ public enum CommandCategory implements Caption {
    // TODO this method shouldn't be invoked
    @Deprecated
    @Override
-    public @NotNull String toString() {
+    public String toString() {
        return this.caption.getComponent(LocaleHolder.console());
    }

@@ -109,5 +108,4 @@ public enum CommandCategory implements Caption {
        return !MainCommand.getInstance().getCommands(this, player).isEmpty();
    }

-
 }
--- a/Core/src/main/java/com/plotsquared/core/command/Condense.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Condense.java
@@ -256,11 +256,11 @@ public class Condense extends SubCommand {
                player.sendMessage(TranslatableCaption.of("condense.default_eval"));
                player.sendMessage(
                        TranslatableCaption.of("condense.minimum_radius"),
-                        TagResolver.resolver("minimum_radius", Tag.inserting(Component.text(minimumRadius)))
+                        TagResolver.resolver("minimumRadius", Tag.inserting(Component.text(minimumRadius)))
                );
                player.sendMessage(
                        TranslatableCaption.of("condense.maximum_moved"),
-                        TagResolver.resolver("maximum_moves", Tag.inserting(Component.text(maxMove)))
+                        TagResolver.resolver("maxMove", Tag.inserting(Component.text(maxMove)))
                );
                player.sendMessage(TranslatableCaption.of("condense.input_eval"));
                player.sendMessage(
@@ -269,7 +269,7 @@ public class Condense extends SubCommand {
                );
                player.sendMessage(
                        TranslatableCaption.of("condense.estimated_moves"),
-                        TagResolver.resolver("user_move", Tag.inserting(Component.text(userMove)))
+                        TagResolver.resolver("userMove", Tag.inserting(Component.text(userMove)))
                );
                player.sendMessage(TranslatableCaption.of("condense.eta"));
                player.sendMessage(TranslatableCaption.of("condense.radius_measured"));
--- a/Core/src/main/java/com/plotsquared/core/command/Copy.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Copy.java
@@ -69,8 +69,7 @@ public class Copy extends SubCommand {

        plot1.getPlotModificationManager().copy(plot2, player).thenAccept(result -> {
            if (result) {
-                player.sendMessage(
-                        TranslatableCaption.of("move.copy_success"),
+                player.sendMessage(TranslatableCaption.of("move.copy_success"),
                        TagResolver.builder()
                                .tag("origin", Tag.inserting(Component.text(plot1.toString())))
                                .tag("target", Tag.inserting(Component.text(plot2.toString())))
--- a/Core/src/main/java/com/plotsquared/core/command/Debug.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Debug.java
@@ -29,6 +29,7 @@ import com.plotsquared.core.util.WorldUtil;
 import com.plotsquared.core.util.entity.EntityCategories;
 import com.plotsquared.core.util.entity.EntityCategory;
 import com.plotsquared.core.util.query.PlotQuery;
+import com.plotsquared.core.util.task.TaskManager;
 import com.plotsquared.core.uuid.UUIDMapping;
 import com.sk89q.worldedit.world.entity.EntityType;
 import net.kyori.adventure.text.Component;
@@ -70,7 +71,7 @@ public class Debug extends SubCommand {
                    TranslatableCaption.of("commandconfig.command_syntax"),
                    TagResolver.resolver(
                            "value",
-                            Tag.inserting(Component.text("/plot debug <player | debug-players | entitytypes | msg>"))
+                            Tag.inserting(Component.text("/plot debug <loadedchunks | player | debug-players | entitytypes | msg>"))
                    )
            );
        }
@@ -84,6 +85,16 @@ public class Debug extends SubCommand {
                return true;
            }
        }
+        if (args.length > 0 && "loadedchunks".equalsIgnoreCase(args[0])) {
+            final long start = System.currentTimeMillis();
+            player.sendMessage(TranslatableCaption.of("debug.fetching_loaded_chunks"));
+            TaskManager.runTaskAsync(() -> player.sendMessage(StaticCaption
+                    .of("Loaded chunks: " + this.worldUtil
+                            .getChunkChunks(player.getLocation().getWorldName())
+                            .size() + " (" + (System.currentTimeMillis()
+                            - start) + "ms) using thread: " + Thread.currentThread().getName())));
+            return true;
+        }
        if (args.length > 0 && "uuids".equalsIgnoreCase(args[0])) {
            final Collection<UUIDMapping> mappings = PlotSquared.get().getImpromptuUUIDPipeline().getAllImmediately();
            player.sendMessage(
@@ -185,7 +196,7 @@ public class Debug extends SubCommand {

    @Override
    public Collection<Command> tab(final PlotPlayer<?> player, String[] args, boolean space) {
-        return Stream.of("debug-players", "entitytypes")
+        return Stream.of("loadedchunks", "debug-players", "entitytypes")
                .filter(value -> value.startsWith(args[0].toLowerCase(Locale.ENGLISH)))
                .map(value -> new Command(null, false, value, "plots.admin", RequiredType.NONE, null) {
                }).collect(Collectors.toList());
--- a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
+++ b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java
@@ -71,9 +71,9 @@ public class DebugPaste extends SubCommand {
                StringBuilder b = new StringBuilder();
                b.append(
                        """
-                                # Welcome to this paste
-                                # It is meant to provide us at IntellectualSites with better information about your problem
-                                """
+                         # Welcome to this paste
+                         # It is meant to provide us at IntellectualSites with better information about your problem
+                         """
                );
                b.append("# PlotSquared Information\n");
                b.append("PlotSquared Version: ").append(PlotSquared.get().getVersion())
--- a/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
+++ b/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
@@ -75,19 +75,16 @@ public class DebugRoadRegen extends SubCommand {
        }
        String kind = args[0].toLowerCase();
        switch (kind) {
-            case "plot" -> {
+            case "plot":
                return regenPlot(player);
-            }
-            case "region" -> {
+            case "region":
                return regenRegion(player, Arrays.copyOfRange(args, 1, args.length));
-            }
-            default -> {
+            default:
                player.sendMessage(
                        TranslatableCaption.of("commandconfig.command_syntax"),
                        TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
                );
                return false;
-            }
        }
    }

@@ -96,7 +93,6 @@ public class DebugRoadRegen extends SubCommand {
        PlotArea area = location.getPlotArea();
        if (area == null) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
-            return false;
        }
        Plot plot = player.getCurrentPlot();
        if (plot == null) {
--- a/Core/src/main/java/com/plotsquared/core/command/Deny.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Deny.java
@@ -117,11 +117,10 @@ public class Deny extends SubCommand {
                    } else if (plot.getDenied().contains(uuid)) {
                        player.sendMessage(
                                TranslatableCaption.of("member.already_added"),
-                                PlotSquared.platform().playerManager().getUsernameCaption(uuid)
-                                        .thenApply(caption -> TagResolver.resolver(
+                                TagResolver.resolver(
                                        "player",
-                                        Tag.inserting(caption.toComponent(player))
-                                ))
+                                        Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
+                                )
                        );
                        return;
                    } else {
--- a/Core/src/main/java/com/plotsquared/core/command/Done.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Done.java
@@ -94,7 +94,7 @@ public class Done extends SubCommand {
                TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
        );
        final Settings.Auto_Clear doneRequirements = Settings.AUTO_CLEAR.get("done");
-        if (PlotSquared.platform().expireManager() == null || doneRequirements == null || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_DONE)) {
+        if (PlotSquared.platform().expireManager() == null || doneRequirements == null) {
            finish(plot, player, true);
            plot.removeRunning();
        } else {
@@ -103,7 +103,7 @@ public class Done extends SubCommand {
                public void run(PlotAnalysis value) {
                    plot.removeRunning();
                    boolean result =
-                            value.getComplexity(doneRequirements) >= doneRequirements.THRESHOLD;
+                            value.getComplexity(doneRequirements) <= doneRequirements.THRESHOLD;
                    finish(plot, player, result);
                }
            });
--- a/Core/src/main/java/com/plotsquared/core/command/Download.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Download.java
@@ -136,9 +136,7 @@ public class Download extends SubCommand {
                    }
                    player.sendMessage(
                            TranslatableCaption.of("web.generation_link_success_legacy_world"),
-                            TagResolver.builder()
-                                    .tag("url", Tag.preProcessParsed(url.toString()))
-                                    .build()
+                            TagResolver.resolver("url", Tag.inserting(Component.text(url.toString())))
                    );
                }
            });
@@ -187,25 +185,22 @@ public class Download extends SubCommand {
        if (Settings.Web.LEGACY_WEBINTERFACE) {
            schematicHandler
                    .getCompoundTag(plot)
-                    .whenComplete((compoundTag, throwable) -> schematicHandler.upload(
-                            compoundTag,
-                            null,
-                            null,
-                            new RunnableVal<>() {
-                                @Override
-                                public void run(URL value) {
-                                    plot.removeRunning();
-                                    player.sendMessage(
-                                            TranslatableCaption.of("web.generation_link_success"),
-                                            TagResolver.builder()
-                                                    .tag("download", Tag.preProcessParsed(value.toString()))
-                                                    .tag("delete", Tag.preProcessParsed("Not available"))
-                                                    .build()
-                                    );
-                                    player.sendMessage(StaticCaption.of(value.toString()));
-                                }
+                    .whenComplete((compoundTag, throwable) -> {
+                        schematicHandler.upload(compoundTag, null, null, new RunnableVal<>() {
+                            @Override
+                            public void run(URL value) {
+                                plot.removeRunning();
+                                player.sendMessage(
+                                        TranslatableCaption.of("web.generation_link_success"),
+                                        TagResolver.builder()
+                                                .tag("download", Tag.preProcessParsed(value.toString()))
+                                                .tag("delete", Tag.preProcessParsed("Not available"))
+                                                .build()
+                                );
+                                player.sendMessage(StaticCaption.of(value.toString()));
                            }
-                    ));
+                        });
+                    });
            return;
        }
        // TODO legacy support
--- a/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java
+++ b/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java
@@ -103,10 +103,9 @@ public final class FlagCommand extends Command {
        if (flag instanceof IntegerFlag && MathMan.isInteger(value)) {
            try {
                int numeric = Integer.parseInt(value);
-                // Getting full permission without ".<amount>" at the end
                perm = perm.substring(0, perm.length() - value.length() - 1);
                boolean result = false;
-                if (numeric >= 0) {
+                if (numeric > 0) {
                    int checkRange = PlotSquared.get().getPlatform().equalsIgnoreCase("bukkit") ?
                            numeric :
                            Settings.Limit.MAX_PLOTS;
--- a/Core/src/main/java/com/plotsquared/core/command/Help.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Help.java
@@ -60,10 +60,9 @@ public class Help extends Command {
            RunnableVal2<Command, CommandResult> whenDone
    ) {
        switch (args.length) {
-            case 0 -> {
+            case 0:
                return displayHelp(player, null, 0);
-            }
-            case 1 -> {
+            case 1:
                if (MathMan.isInteger(args[0])) {
                    try {
                        return displayHelp(player, null, Integer.parseInt(args[0]));
@@ -73,8 +72,7 @@ public class Help extends Command {
                } else {
                    return displayHelp(player, args[0], 1);
                }
-            }
-            case 2 -> {
+            case 2:
                if (MathMan.isInteger(args[1])) {
                    try {
                        return displayHelp(player, args[0], Integer.parseInt(args[1]));
@@ -83,8 +81,8 @@ public class Help extends Command {
                    }
                }
                return CompletableFuture.completedFuture(false);
-            }
-            default -> sendUsage(player);
+            default:
+                sendUsage(player);
        }
        return CompletableFuture.completedFuture(true);
    }
@@ -134,12 +132,7 @@ public class Help extends Command {
                                TagResolver.builder()
                                        .tag("command", Tag.inserting(Component.text("/plot help")))
                                        .tag("category", Tag.inserting(Component.text("all")))
-                                        .tag(
-                                                "category_desc",
-                                                Tag.inserting(TranslatableCaption
-                                                        .of("help.help_display_all_commands")
-                                                        .toComponent(player))
-                                        )
+                                        .tag("category_desc", Tag.inserting(TranslatableCaption.of("help.help_display_all_commands").toComponent(player)))
                                        .build()
                        ));
                builder.append(Component.newline()).append(MINI_MESSAGE.deserialize(TranslatableCaption
--- a/Core/src/main/java/com/plotsquared/core/command/Inbox.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Inbox.java
@@ -85,24 +85,24 @@ public class Inbox extends SubCommand {
        for (int x = page * 12; x < max; x++) {
            PlotComment comment = comments[x];
            Component commentColored;
-            if (player.getName().equals(comment.senderName())) {
+            if (player.getName().equals(comment.senderName)) {
                commentColored = MINI_MESSAGE
                        .deserialize(
                                TranslatableCaption.of("list.comment_list_by_lister").getComponent(player),
-                                TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment())))
+                                TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment)))
                        );
            } else {
                commentColored = MINI_MESSAGE
                        .deserialize(
                                TranslatableCaption.of("list.comment_list_by_other").getComponent(player),
-                                TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment())))
+                                TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment)))
                        );
            }
            TagResolver resolver = TagResolver.builder()
                    .tag("number", Tag.inserting(Component.text(x)))
-                    .tag("world", Tag.inserting(Component.text(comment.world())))
-                    .tag("plot_id", Tag.inserting(Component.text(comment.id().getX() + ";" + comment.id().getY())))
-                    .tag("commenter", Tag.inserting(Component.text(comment.senderName())))
+                    .tag("world", Tag.inserting(Component.text(comment.world)))
+                    .tag("plot_id", Tag.inserting(Component.text(comment.id.getX() + ";" + comment.id.getY())))
+                    .tag("commenter", Tag.inserting(Component.text(comment.senderName)))
                    .tag("comment", Tag.inserting(commentColored))
                    .build();
            builder.append(MINI_MESSAGE
@@ -137,7 +137,7 @@ public class Inbox extends SubCommand {
                                int unread = 0;
                                for (PlotComment comment : value) {
                                    total++;
-                                    if (comment.timestamp() > CommentManager
+                                    if (comment.timestamp > CommentManager
                                            .getTimestamp(player, inbox.toString())) {
                                        unread++;
                                    }
@@ -190,7 +190,7 @@ public class Inbox extends SubCommand {
        final int page;
        if (args.length > 1) {
            switch (args[1].toLowerCase()) {
-                case "delete" -> {
+                case "delete":
                    if (!inbox.canModify(plot, player)) {
                        player.sendMessage(TranslatableCaption.of("comment.no_perm_inbox_modify"));
                        return false;
@@ -225,6 +225,7 @@ public class Inbox extends SubCommand {
                        );
                        return false;
                    }
+
                    if (!inbox.getComments(plot, new RunnableVal<>() {
                        @Override
                        public void run(List<PlotComment> value) {
@@ -241,7 +242,7 @@ public class Inbox extends SubCommand {
                            if (success) {
                                player.sendMessage(
                                        TranslatableCaption.of("comment.comment_removed_success"),
-                                        TagResolver.resolver("value", Tag.inserting(Component.text(comment.comment())))
+                                        TagResolver.resolver("value", Tag.inserting(Component.text(comment.comment)))
                                );
                            } else {
                                player.sendMessage(
@@ -253,8 +254,7 @@ public class Inbox extends SubCommand {
                        return false;
                    }
                    return true;
-                }
-                case "clear" -> {
+                case "clear":
                    if (!inbox.canModify(plot, player)) {
                        player.sendMessage(TranslatableCaption.of("comment.no_perm_inbox_modify"));
                    }
@@ -268,15 +268,13 @@ public class Inbox extends SubCommand {
                        plot.getPlotCommentContainer().removeComments(comments);
                    }
                    return true;
-                }
-                default -> {
+                default:
                    try {
                        page = Integer.parseInt(args[1]);
                    } catch (NumberFormatException ignored) {
                        sendUsage(player);
                        return false;
                    }
-                }
            }
        } else {
            page = 1;
--- a/Core/src/main/java/com/plotsquared/core/command/Info.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Info.java
@@ -52,9 +52,8 @@ public class Info extends SubCommand {
            arg = args[0];
            switch (arg) {
                // TODO: (re?)implement /plot info inv. (it was never properly implemented)
-                case "trusted", "alias", "biome", "denied", "flags", "id", "size", "members", "creationdate", "seen", "owner", "rating", "likes" ->
-                        plot = Plot
-                                .getPlotFromString(player, null, false);
+                case "trusted", "alias", "biome", "denied", "flags", "id", "size", "members", "creationdate", "seen", "owner", "rating", "likes" -> plot = Plot
+                        .getPlotFromString(player, null, false);
                default -> {
                    plot = Plot.getPlotFromString(player, arg, false);
                    if (args.length == 2) {
--- a/Core/src/main/java/com/plotsquared/core/command/Kick.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Kick.java
@@ -112,15 +112,15 @@ public class Kick extends SubCommand {
                for (PlotPlayer<?> player2 : players) {
                    if (!plot.equals(player2.getCurrentPlot())) {
                        player.sendMessage(
-                                TranslatableCaption.of("kick.player_not_in_plot"),
-                                TagResolver.resolver("player", Tag.inserting(Component.text(player2.getName())))
+                                TranslatableCaption.of("errors.invalid_player"),
+                                TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
                        );
                        return;
                    }
                    if (player2.hasPermission(Permission.PERMISSION_ADMIN_ENTRY_DENIED)) {
                        player.sendMessage(
-                                TranslatableCaption.of("kick.cannot_kick_player"),
-                                TagResolver.resolver("player", Tag.inserting(Component.text(player2.getName())))
+                                TranslatableCaption.of("cluster.cannot_kick_player"),
+                                TagResolver.resolver("name", Tag.inserting(Component.text(player2.getName())))
                        );
                        return;
                    }
--- a/Core/src/main/java/com/plotsquared/core/command/ListCmd.java
+++ b/Core/src/main/java/com/plotsquared/core/command/ListCmd.java
@@ -465,7 +465,7 @@ public class ListCmd extends SubCommand {
                TextComponent.Builder builder = Component.text();
                if (plot.getFlag(ServerPlotFlag.class)) {
                    TagResolver serverResolver = TagResolver.resolver(
-                            "server",
+                            "info.server",
                            Tag.inserting(TranslatableCaption.of("info.server").toComponent(player))
                    );
                    builder.append(MINI_MESSAGE.deserialize(server, serverResolver));
@@ -474,22 +474,22 @@ public class ListCmd extends SubCommand {
                        final List<UUIDMapping> names = PlotSquared.get().getImpromptuUUIDPipeline().getNames(plot.getOwners())
                                .get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS);
                        for (final UUIDMapping uuidMapping : names) {
-                            PlotPlayer<?> pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuidMapping.uuid());
+                            PlotPlayer<?> pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuidMapping.getUuid());
                            TagResolver resolver = TagResolver.builder()
-                                    .tag("prefix", Tag.inserting(Component.text(prefix)))
-                                    .tag("player", Tag.inserting(Component.text(uuidMapping.username())))
-                                    .build();
-                            if (pp != null) {
-                                builder.append(MINI_MESSAGE.deserialize(online, resolver));
-                            } else if (uuidMapping.username().equalsIgnoreCase("unknown")) {
+                                .tag("prefix", Tag.inserting(Component.text(prefix)))
+                                .tag("player", Tag.inserting(Component.text(uuidMapping.getUsername())))
+                                .build();
+                        if (pp != null) {
+                            builder.append(MINI_MESSAGE.deserialize(online, resolver));
+                            } else if (uuidMapping.getUsername().equalsIgnoreCase("unknown")) {
                                TagResolver unknownResolver = TagResolver.resolver(
-                                        "unknown",
+                                        "info.unknown",
                                        Tag.inserting(TranslatableCaption.of("info.unknown").toComponent(player))
                                );
                                builder.append(MINI_MESSAGE.deserialize(unknown, unknownResolver));
-                            } else if (uuidMapping.uuid().equals(DBFunc.EVERYONE)) {
+                            } else if (uuidMapping.getUuid().equals(DBFunc.EVERYONE)) {
                                TagResolver everyoneResolver = TagResolver.resolver(
-                                        "everyone",
+                                        "info.everyone",
                                        Tag.inserting(TranslatableCaption.of("info.everyone").toComponent(player))
                                );
                                builder.append(MINI_MESSAGE.deserialize(everyone, everyoneResolver));
@@ -517,7 +517,6 @@ public class ListCmd extends SubCommand {
                    }
                }
                finalResolver.tag("players", Tag.inserting(builder.asComponent()));
-                finalResolver.tag("size", Tag.inserting(Component.text(plot.getConnectedPlots().size())));
                caption.set(TranslatableCaption.of("info.plot_list_item"));
                caption.setTagResolvers(finalResolver.build());
            }
--- a/Core/src/main/java/com/plotsquared/core/command/Load.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Load.java
@@ -41,7 +41,6 @@ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;

 import java.net.MalformedURLException;
-import java.net.URI;
 import java.net.URL;
 import java.util.Collections;
 import java.util.List;
@@ -117,7 +116,7 @@ public class Load extends SubCommand {
                    }
                    final URL url;
                    try {
-                        url = URI.create(Settings.Web.URL + "saves/" + player.getUUID() + '/' + schematic).toURL();
+                        url = new URL(Settings.Web.URL + "saves/" + player.getUUID() + '/' + schematic);
                    } catch (MalformedURLException e) {
                        e.printStackTrace();
                        player.sendMessage(TranslatableCaption.of("web.load_failed"));
--- a/Core/src/main/java/com/plotsquared/core/command/MainCommand.java
+++ b/Core/src/main/java/com/plotsquared/core/command/MainCommand.java
@@ -86,7 +86,6 @@ public class MainCommand extends Command {
            commands.add(CreateRoadSchematic.class);
            commands.add(DebugAllowUnsafe.class);
            commands.add(RegenAllRoads.class);
-            commands.add(Claim.class);
            commands.add(Auto.class);
            commands.add(HomeCommand.class);
            commands.add(Visit.class);
@@ -94,7 +93,6 @@ public class MainCommand extends Command {
            commands.add(Clear.class);
            commands.add(Delete.class);
            commands.add(Trust.class);
-            commands.add(Add.class);
            commands.add(Leave.class);
            commands.add(Deny.class);
            commands.add(Remove.class);
@@ -130,7 +128,6 @@ public class MainCommand extends Command {
            commands.add(Owner.class);
            commands.add(Desc.class);
            commands.add(Biome.class);
-            commands.add(Alias.class);
            commands.add(SetHome.class);
            commands.add(Cluster.class);
            commands.add(DebugImportWorlds.class);
@@ -183,7 +180,7 @@ public class MainCommand extends Command {
                    if (cmd.hasConfirmation(player)) {
                        CmdConfirm.addPending(player, cmd.getUsage(), () -> {
                            PlotArea area = player.getApplicablePlotArea();
-                            if (area != null && econHandler.isEnabled(area) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON)) {
+                            if (area != null && econHandler.isEnabled(area)) {
                                PlotExpression priceEval =
                                        area.getPrices().get(cmd.getFullId());
                                double price = priceEval != null ? priceEval.evaluate(0d) : 0d;
@@ -201,7 +198,7 @@ public class MainCommand extends Command {
                        return;
                    }
                    PlotArea area = player.getApplicablePlotArea();
-                    if (area != null && econHandler.isEnabled(area) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON)) {
+                    if (area != null && econHandler.isEnabled(area)) {
                        PlotExpression priceEval = area.getPrices().get(cmd.getFullId());
                        double price = priceEval != null ? priceEval.evaluate(0d) : 0d;
                        if (price != 0d && econHandler.getMoney(player) < price) {
--- a/Core/src/main/java/com/plotsquared/core/command/Merge.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Merge.java
@@ -109,7 +109,7 @@ public class Merge extends SubCommand {
                }
            }
            if (direction == null && (args[0].equalsIgnoreCase("all") || args[0]
-                    .equalsIgnoreCase("auto")) && player.hasPermission(Permission.PERMISSION_MERGE_ALL)) {
+                    .equalsIgnoreCase("auto"))) {
                direction = Direction.ALL;
            }
        }
@@ -178,7 +178,7 @@ public class Merge extends SubCommand {
                return true;
            }
            if (plot.getPlotModificationManager().autoMerge(Direction.ALL, maxSize, uuid, player, terrain)) {
-                if (this.econHandler.isEnabled(plotArea) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON) && price > 0d) {
+                if (this.econHandler.isEnabled(plotArea) && price > 0d) {
                    this.econHandler.withdrawMoney(player, price);
                    player.sendMessage(
                            TranslatableCaption.of("economy.removed_balance"),
@@ -196,8 +196,8 @@ public class Merge extends SubCommand {
            player.sendMessage(TranslatableCaption.of("merge.no_available_automerge"));
            return false;
        }
-        if (!force && this.econHandler.isEnabled(plotArea) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON) && price > 0d && this.econHandler.getMoney(
-                player) < price) {
+        if (!force && this.econHandler.isEnabled(plotArea) && price > 0d
+                && this.econHandler.getMoney(player) < price) {
            player.sendMessage(
                    TranslatableCaption.of("economy.cannot_afford_merge"),
                    TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
@@ -218,7 +218,7 @@ public class Merge extends SubCommand {
            return true;
        }
        if (plot.getPlotModificationManager().autoMerge(direction, maxSize - size, uuid, player, terrain)) {
-            if (this.econHandler.isEnabled(plotArea) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON) && price > 0d) {
+            if (this.econHandler.isEnabled(plotArea) && price > 0d) {
                this.econHandler.withdrawMoney(player, price);
                player.sendMessage(
                        TranslatableCaption.of("economy.removed_balance"),
@@ -259,7 +259,7 @@ public class Merge extends SubCommand {
                    accepter.sendMessage(TranslatableCaption.of("merge.merge_not_valid"));
                    return;
                }
-                if (this.econHandler.isEnabled(plotArea) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON) && price > 0d) {
+                if (this.econHandler.isEnabled(plotArea) && price > 0d) {
                    if (!force && this.econHandler.getMoney(player) < price) {
                        player.sendMessage(
                                TranslatableCaption.of("economy.cannot_afford_merge"),
@@ -303,7 +303,7 @@ public class Merge extends SubCommand {
                        player,
                        terrain
                )) {
-                    if (this.econHandler.isEnabled(plotArea) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON) && price > 0d) {
+                    if (this.econHandler.isEnabled(plotArea) && price > 0d) {
                        if (!force && this.econHandler.getMoney(player) < price) {
                            player.sendMessage(
                                    TranslatableCaption.of("economy.cannot_afford_merge"),
--- a/Core/src/main/java/com/plotsquared/core/command/Music.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Music.java
@@ -56,7 +56,7 @@ public class Music extends SubCommand {
            .asList("music_disc_13", "music_disc_cat", "music_disc_blocks", "music_disc_chirp",
                    "music_disc_far", "music_disc_mall", "music_disc_mellohi", "music_disc_stal",
                    "music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait", "music_disc_otherside",
-                    "music_disc_pigstep", "music_disc_5", "music_disc_relic"
+                    "music_disc_pigstep", "music_disc_5"
            );

    private final InventoryUtil inventoryUtil;
--- a/Core/src/main/java/com/plotsquared/core/command/Owner.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Owner.java
@@ -31,6 +31,7 @@ import com.plotsquared.core.player.PlayerMetaDataKeys;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.util.EventDispatcher;
+import com.plotsquared.core.util.PlayerManager;
 import com.plotsquared.core.util.TabCompletions;
 import com.plotsquared.core.util.task.TaskManager;
 import net.kyori.adventure.text.Component;
@@ -135,11 +136,10 @@ public class Owner extends SetCommand {
            if (plot.isOwner(uuid)) {
                player.sendMessage(
                        TranslatableCaption.of("member.already_owner"),
-                        PlotSquared.platform().playerManager().getUsernameCaption(uuid)
-                                .thenApply(caption -> TagResolver.resolver(
+                        TagResolver.resolver(
                                "player",
-                                Tag.inserting(caption.toComponent(player))
-                        ))
+                                Tag.inserting(PlayerManager.resolveName(uuid, false).toComponent(player))
+                        )
                );
                return;
            }
@@ -147,11 +147,10 @@ public class Owner extends SetCommand {
                if (other == null) {
                    player.sendMessage(
                            TranslatableCaption.of("errors.invalid_player_offline"),
-                            PlotSquared.platform().playerManager().getUsernameCaption(uuid)
-                                    .thenApply(caption -> TagResolver.resolver(
+                            TagResolver.resolver(
                                    "player",
-                                    Tag.inserting(caption.toComponent(player))
-                            ))
+                                    Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
+                            )
                    );
                    return;
                }
--- a/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java
+++ b/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java
@@ -46,7 +46,7 @@ public class PluginCmd extends SubCommand {
            player.sendMessage(StaticCaption.of(
                    "<gray>>> </gray><gold><bold>Authors<reset><gray>: </gray><gold>Citymonstret </gold><gray>& </gray><gold>Empire92 </gold><gray>& </gray><gold>MattBDev </gold><gray>& </gray><gold>dordsor21 </gold><gray>& </gray><gold>NotMyFault </gold><gray>& </gray><gold>SirYwell</gold>"));
            player.sendMessage(StaticCaption.of(
-                    "<gray>>> </gray><gold><bold>Wiki<reset><gray>: </gray><gold><click:open_url:https://intellectualsites.gitbook.io/plotsquared/>https://intellectualsites.gitbook.io/plotsquared/</gold>"));
+                    "<gray>>> </gray><gold><bold>Wiki<reset><gray>: </gray><gold><click:open_url:https://intellectualsites.github.io/plotsquared-documentation/>https://intellectualsites.github.io/plotsquared-documentation/</gold>"));
            player.sendMessage(StaticCaption.of(
                    "<gray>>> </gray><gold><bold>Discord<reset><gray>: </gray><gold><click:open_url:https://discord.gg/intellectualsites>https://discord.gg/intellectualsites</gold>"));
            player.sendMessage(
--- a/Core/src/main/java/com/plotsquared/core/command/Purge.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Purge.java
@@ -90,8 +90,12 @@ public class Purge extends SubCommand {
                return false;
            }
            switch (split[0].toLowerCase()) {
-                case "world", "w" -> world = split[1];
-                case "area", "a" -> {
+                case "world":
+                case "w":
+                    world = split[1];
+                    break;
+                case "area":
+                case "a":
                    area = this.plotAreaManager.getPlotAreaByString(split[1]);
                    if (area == null) {
                        player.sendMessage(
@@ -100,8 +104,9 @@ public class Purge extends SubCommand {
                        );
                        return false;
                    }
-                }
-                case "plotid", "id" -> {
+                    break;
+                case "plotid":
+                case "id":
                    try {
                        id = PlotId.fromString(split[1]);
                    } catch (IllegalArgumentException ignored) {
@@ -111,8 +116,9 @@ public class Purge extends SubCommand {
                        );
                        return false;
                    }
-                }
-                case "owner", "o" -> {
+                    break;
+                case "owner":
+                case "o":
                    UUIDMapping ownerMapping = PlotSquared.get().getImpromptuUUIDPipeline().getImmediately(split[1]);
                    if (ownerMapping == null) {
                        player.sendMessage(
@@ -121,9 +127,10 @@ public class Purge extends SubCommand {
                        );
                        return false;
                    }
-                    owner = ownerMapping.uuid();
-                }
-                case "shared", "s" -> {
+                    owner = ownerMapping.getUuid();
+                    break;
+                case "shared":
+                case "s":
                    UUIDMapping addedMapping = PlotSquared.get().getImpromptuUUIDPipeline().getImmediately(split[1]);
                    if (addedMapping == null) {
                        player.sendMessage(
@@ -132,14 +139,23 @@ public class Purge extends SubCommand {
                        );
                        return false;
                    }
-                    added = addedMapping.uuid();
-                }
-                case "clear", "c", "delete", "d", "del" -> clear = Boolean.parseBoolean(split[1]);
-                case "unknown", "?", "u" -> unknown = Boolean.parseBoolean(split[1]);
-                default -> {
+                    added = addedMapping.getUuid();
+                    break;
+                case "clear":
+                case "c":
+                case "delete":
+                case "d":
+                case "del":
+                    clear = Boolean.parseBoolean(split[1]);
+                    break;
+                case "unknown":
+                case "?":
+                case "u":
+                    unknown = Boolean.parseBoolean(split[1]);
+                    break;
+                default:
                    sendUsage(player);
                    return false;
-                }
            }
        }
        final HashSet<Plot> toDelete = new HashSet<>();
@@ -220,9 +236,9 @@ public class Purge extends SubCommand {
                            try {
                                ids.add(plot.temp);
                                if (finalClear) {
-                                    plot.getPlotModificationManager().clear(false, true, player,
-                                            () -> LOGGER.info("Plot {} cleared by purge", plot.getId())
-                                    );
+                                    plot.getPlotModificationManager().clear(false, true, player, () -> {
+                                        LOGGER.info("Plot {} cleared by purge", plot.getId());
+                                    });
                                } else {
                                    plot.getPlotModificationManager().removeSign();
                                }
--- a/Core/src/main/java/com/plotsquared/core/command/Remove.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Remove.java
@@ -100,17 +100,15 @@ public class Remove extends SubCommand {
                            count++;
                        }
                    } else if (uuid == DBFunc.EVERYONE) {
-                        count += plot.getTrusted().size();
                        if (plot.removeTrusted(uuid)) {
                            this.eventDispatcher.callTrusted(player, plot, uuid, false);
-                        }
-                        count += plot.getMembers().size();
-                        if (plot.removeMember(uuid)) {
+                            count++;
+                        } else if (plot.removeMember(uuid)) {
                            this.eventDispatcher.callMember(player, plot, uuid, false);
-                        }
-                        count += plot.getDenied().size();
-                        if (plot.removeDenied(uuid)) {
+                            count++;
+                        } else if (plot.removeDenied(uuid)) {
                            this.eventDispatcher.callDenied(player, plot, uuid, false);
+                            count++;
                        }
                    }
                }
--- a/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java
+++ b/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java
@@ -40,7 +40,6 @@ 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 java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -131,7 +130,8 @@ public class SchematicCmd extends SubCommand {
                    if (location.startsWith("url:")) {
                        try {
                            UUID uuid = UUID.fromString(location.substring(4));
-                            URL url = URI.create(Settings.Web.URL + "uploads/" + uuid + ".schematic").toURL();
+                            URL base = new URL(Settings.Web.URL);
+                            URL url = new URL(base, "uploads/" + uuid + ".schematic");
                            schematic = this.schematicHandler.getSchematic(url);
                        } catch (Exception e) {
                            e.printStackTrace();
--- a/Core/src/main/java/com/plotsquared/core/command/Template.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Template.java
@@ -156,9 +156,9 @@ public class Template extends SubCommand {
             ZipOutputStream zos = new ZipOutputStream(fos)) {

            for (FileBytes file : files) {
-                ZipEntry ze = new ZipEntry(file.path());
+                ZipEntry ze = new ZipEntry(file.path);
                zos.putNextEntry(ze);
-                zos.write(file.data());
+                zos.write(file.data);
            }
            zos.closeEntry();
        }
--- a/Core/src/main/java/com/plotsquared/core/command/Trust.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Trust.java
@@ -19,7 +19,6 @@
 package com.plotsquared.core.command;

 import com.google.inject.Inject;
-import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.database.DBFunc;
@@ -104,11 +103,10 @@ public class Trust extends Command {
                            player.hasPermission(Permission.PERMISSION_TRUST_EVERYONE) || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_TRUST))) {
                        player.sendMessage(
                                TranslatableCaption.of("errors.invalid_player"),
-                                PlotSquared.platform().playerManager().getUsernameCaption(uuid)
-                                        .thenApply(caption -> TagResolver.resolver(
+                                TagResolver.resolver(
                                        "value",
-                                        Tag.inserting(caption.toComponent(player))
-                                ))
+                                        Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
+                                )
                        );
                        iterator.remove();
                        continue;
@@ -116,11 +114,10 @@ public class Trust extends Command {
                    if (currentPlot.isOwner(uuid)) {
                        player.sendMessage(
                                TranslatableCaption.of("member.already_added"),
-                                PlotSquared.platform().playerManager().getUsernameCaption(uuid)
-                                        .thenApply(caption -> TagResolver.resolver(
-                                        "player",
-                                        Tag.inserting(caption.toComponent(player))
-                                ))
+                                TagResolver.resolver(
+                                        "value",
+                                        Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
+                                )
                        );
                        iterator.remove();
                        continue;
@@ -128,11 +125,10 @@ public class Trust extends Command {
                    if (currentPlot.getTrusted().contains(uuid)) {
                        player.sendMessage(
                                TranslatableCaption.of("member.already_added"),
-                                PlotSquared.platform().playerManager().getUsernameCaption(uuid)
-                                        .thenApply(caption -> TagResolver.resolver(
-                                        "player",
-                                        Tag.inserting(caption.toComponent(player))
-                                ))
+                                TagResolver.resolver(
+                                        "value",
+                                        Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
+                                )
                        );
                        iterator.remove();
                        continue;
--- a/Core/src/main/java/com/plotsquared/core/commands/CommandAdd.java
+++ b/Core/src/main/java/com/plotsquared/core/commands/CommandAdd.java
@@ -0,0 +1,104 @@
+/*
+ * PlotSquared, a land and world management plugin for Minecraft.
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ * Copyright (C) IntellectualSites team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.commands;
+
+import cloud.commandframework.annotations.Argument;
+import cloud.commandframework.annotations.CommandMethod;
+import cloud.commandframework.annotations.CommandPermission;
+import com.google.inject.Inject;
+import com.plotsquared.core.commands.arguments.PlotMember;
+import com.plotsquared.core.commands.requirements.Requirement;
+import com.plotsquared.core.commands.requirements.CommandRequirement;
+import com.plotsquared.core.configuration.Settings;
+import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.permissions.Permission;
+import com.plotsquared.core.player.PlotPlayer;
+import com.plotsquared.core.plot.Plot;
+import com.plotsquared.core.util.EventDispatcher;
+import com.plotsquared.core.util.PlayerManager;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+class CommandAdd implements PlotSquaredCommandContainer {
+
+    private final EventDispatcher eventDispatcher;
+
+    @Inject
+    CommandAdd(final @NonNull EventDispatcher eventDispatcher) {
+        this.eventDispatcher = eventDispatcher;
+    }
+
+    @Requirement(CommandRequirement.PLAYER)
+    @Requirement(CommandRequirement.IS_OWNER)
+    @CommandPermission("plots.add")
+    @CommandMethod("${command.prefix} add [target]")
+    public void commandAdd(
+            final @NonNull PlotPlayer<?> sender,
+            @Argument("target") final PlotMember target,
+            final @NonNull Plot plot
+    ) {
+        if (target instanceof PlotMember.Everyone) {
+            if (!sender.hasPermission(Permission.PERMISSION_TRUST_EVERYONE) && !sender.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_TRUST)) {
+                sender.sendMessage(
+                        TranslatableCaption.of("errors.invalid_player"),
+                        TagResolver.resolver("value", Tag.inserting(
+                                PlayerManager.resolveName(target.uuid()).toComponent(sender)
+                        ))
+                );
+                return;
+            }
+        } else if (plot.isOwner(target.uuid())) {
+            sender.sendMessage(
+                    TranslatableCaption.of("member.already_added"),
+                    TagResolver.resolver("player", Tag.inserting(
+                            PlayerManager.resolveName(target.uuid()).toComponent(sender)
+                    ))
+            );
+            return;
+        } else if (plot.getMembers().contains(target.uuid())) {
+            sender.sendMessage(
+                    TranslatableCaption.of("member.already_added"),
+                    TagResolver.resolver("player", Tag.inserting(
+                            PlayerManager.resolveName(target.uuid()).toComponent(sender)
+                    ))
+            );
+            return;
+        } else if (plot.getMembers().size() >= sender.hasPermissionRange(Permission.PERMISSION_ADD, Settings.Limit.MAX_PLOTS)) {
+            sender.sendMessage(
+                    TranslatableCaption.of("members.plot_max_members_added"),
+                    TagResolver.resolver("amount", Tag.inserting(Component.text(plot.getMembers().size())))
+            );
+            return;
+        }
+
+        if (target instanceof PlotMember.Player) {
+            if (!plot.removeTrusted(target.uuid())) {
+                if (plot.getDenied().contains(target.uuid())) {
+                    plot.removeDenied(target.uuid());
+                }
+            }
+        }
+
+        plot.addMember(target.uuid());
+        this.eventDispatcher.callMember(sender, plot, target.uuid(), true);
+        sender.sendMessage(TranslatableCaption.of("member.member_added"));
+    }
+}
--- a/Core/src/main/java/com/plotsquared/core/commands/CommandAlias.java
+++ b/Core/src/main/java/com/plotsquared/core/commands/CommandAlias.java
@@ -0,0 +1,136 @@
+package com.plotsquared.core.commands;
+
+import cloud.commandframework.annotations.Argument;
+import cloud.commandframework.annotations.CommandMethod;
+import cloud.commandframework.annotations.CommandPermission;
+import com.plotsquared.core.PlotSquared;
+import com.plotsquared.core.commands.requirements.CommandRequirement;
+import com.plotsquared.core.commands.requirements.Requirement;
+import com.plotsquared.core.configuration.Settings;
+import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.permissions.Permission;
+import com.plotsquared.core.player.PlotPlayer;
+import com.plotsquared.core.plot.Plot;
+import com.plotsquared.core.util.MathMan;
+import com.plotsquared.core.util.query.PlotQuery;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+import java.util.concurrent.TimeoutException;
+
+public class CommandAlias implements PlotSquaredCommandContainer {
+
+    @Requirement(CommandRequirement.PLAYER)
+    @Requirement(CommandRequirement.PLOT_HAS_OWNER)
+    @CommandPermission("plots.alias")
+    @CommandMethod("${command.prefix} alias set <alias>")
+    public void commandAliasSet(
+            final @NonNull PlotPlayer<?> sender,
+            final @NonNull Plot plot,
+            @Argument("alias") final @NonNull String alias
+    ) {
+        final boolean isOwner = plot.isOwner(sender.getUUID());
+
+        if (!isOwner && !sender.hasPermission(Permission.PERMISSION_ADMIN_ALIAS_SET)) {
+            sender.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
+            return;
+        } else if (!sender.hasPermission(Permission.PERMISSION_ALIAS_SET)) {
+            sender.sendMessage(
+                    TranslatableCaption.of("permission.no_permission"),
+                    TagResolver.resolver(
+                            "node",
+                            Tag.inserting(Permission.PERMISSION_ALIAS_SET)
+                    )
+            );
+            return;
+        }
+
+        if (alias.length() >= 50) {
+            sender.sendMessage(TranslatableCaption.of("alias.alias_too_long"));
+            return;
+        }
+
+        if (MathMan.isInteger(alias)) {
+            sender.sendMessage(TranslatableCaption.of("flag.not_valid_value")); // TODO this is obviously wrong
+            return;
+        }
+
+        if (PlotQuery.newQuery().inArea(plot.getArea())
+                .withAlias(alias)
+                .anyMatch()) {
+            sender.sendMessage(
+                    TranslatableCaption.of("alias.alias_is_taken"),
+                    TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
+            );
+            return;
+        }
+
+        if (Settings.UUID.OFFLINE) {
+            plot.setAlias(alias);
+            sender.sendMessage(
+                    TranslatableCaption.of("alias.alias_set_to"),
+                    TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
+            );
+            return;
+        }
+
+        PlotSquared.get().getImpromptuUUIDPipeline().getSingle(alias, ((uuid, throwable) -> {
+            if (throwable instanceof TimeoutException) {
+                sender.sendMessage(TranslatableCaption.of("players.fetching_players_timeout"));
+            } else if (uuid != null) {
+                sender.sendMessage(
+                        TranslatableCaption.of("alias.alias_is_taken"),
+                        TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
+                );
+            } else {
+                plot.setAlias(alias);
+                sender.sendMessage(
+                        TranslatableCaption.of("alias.alias_set_to"),
+                        TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
+                );
+            }
+        }));
+    }
+
+    @Requirement(CommandRequirement.PLAYER)
+    @Requirement(CommandRequirement.PLOT_HAS_OWNER)
+    @CommandPermission("plots.alias")
+    @CommandMethod("${command.prefix} alias remove")
+    public void commandAliasRemove(
+            final @NonNull PlotPlayer<?> sender,
+            final @NonNull Plot plot
+    ) {
+        final boolean isOwner = plot.isOwner(sender.getUUID());
+
+        if (!isOwner && !sender.hasPermission(Permission.PERMISSION_ADMIN_ALIAS_REMOVE)) {
+            sender.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
+            return;
+        } else if (!sender.hasPermission(Permission.PERMISSION_ALIAS_REMOVE)) {
+            sender.sendMessage(
+                    TranslatableCaption.of("permission.no_permission"),
+                    TagResolver.resolver(
+                            "node",
+                            Tag.inserting(Permission.PERMISSION_ALIAS_REMOVE)
+                    )
+            );
+            return;
+        }
+
+        if (plot.getAlias().isEmpty()) {
+            sender.sendMessage(
+                    TranslatableCaption.of("alias.no_alias_set")
+            );
+            return;
+        }
+
+        final String currentAlias = plot.getAlias();
+        plot.setAlias(null);
+
+        sender.sendMessage(
+                TranslatableCaption.of("alias.alias_removed"),
+                TagResolver.resolver("alias", Tag.inserting(Component.text(currentAlias)))
+        );
+    }
+}
--- a/Core/src/main/java/com/plotsquared/core/commands/CommandClaim.java
+++ b/Core/src/main/java/com/plotsquared/core/commands/CommandClaim.java
@@ -1,24 +1,11 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.core.command;
+package com.plotsquared.core.commands;

+import cloud.commandframework.annotations.Argument;
+import cloud.commandframework.annotations.CommandMethod;
+import cloud.commandframework.annotations.CommandPermission;
 import com.google.inject.Inject;
+import com.plotsquared.core.commands.requirements.CommandRequirement;
+import com.plotsquared.core.commands.requirements.Requirement;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.database.DBFunc;
@@ -26,7 +13,6 @@ import com.plotsquared.core.events.PlayerClaimPlotEvent;
 import com.plotsquared.core.events.PlotMergeEvent;
 import com.plotsquared.core.events.Result;
 import com.plotsquared.core.location.Direction;
-import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.MetaDataAccess;
 import com.plotsquared.core.player.PlayerMetaDataKeys;
@@ -43,22 +29,17 @@ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;

-@CommandDeclaration(
-        command = "claim",
-        aliases = "c",
-        category = CommandCategory.CLAIMING,
-        requiredType = RequiredType.PLAYER, permission = "plots.claim",
-        usage = "/plot claim")
-public class Claim extends SubCommand {
+public class CommandClaim implements PlotSquaredCommandContainer {

-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Claim.class.getSimpleName());
+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + CommandClaim.class.getSimpleName());

    private final EventDispatcher eventDispatcher;
    private final EconHandler econHandler;

    @Inject
-    public Claim(
+    CommandClaim(
            final @NonNull EventDispatcher eventDispatcher,
            final @NonNull EconHandler econHandler
    ) {
@@ -66,153 +47,168 @@ public class Claim extends SubCommand {
        this.econHandler = econHandler;
    }

-    @Override
-    public boolean onCommand(final PlotPlayer<?> player, String[] args) {
-        String schematic = null;
-        if (args.length >= 1) {
-            schematic = args[0];
-        }
-        Location location = player.getLocation();
-        Plot plot = location.getPlotAbs();
-        if (plot == null) {
-            player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
-            return false;
-        }
-        final PlayerClaimPlotEvent event = this.eventDispatcher.callClaim(player, plot, schematic);
-        schematic = event.getSchematic();
+    @Requirement(CommandRequirement.PLAYER)
+    @Requirement(CommandRequirement.IN_PLOT)
+    @CommandPermission("plots.add")
+    @CommandMethod("${command.prefix} claim [schematic]")
+    public void commandClaim(
+            final @NonNull PlotPlayer<?> sender,
+            final @NonNull Plot plot,
+            @Argument("schematic") final @Nullable String schematic
+    ) {
+        final PlayerClaimPlotEvent event = this.eventDispatcher.callClaim(sender, plot, schematic);
        if (event.getEventResult() == Result.DENY) {
-            player.sendMessage(
+            sender.sendMessage(
                    TranslatableCaption.of("events.event_denied"),
                    TagResolver.resolver("value", Tag.inserting(Component.text("Claim")))
            );
-            return true;
+            return;
        }
-        boolean force = event.getEventResult() == Result.FORCE;
-        int currentPlots = Settings.Limit.GLOBAL ?
-                player.getPlotCount() :
-                player.getPlotCount(location.getWorldName());

+        final boolean forceClaim = event.getEventResult() == Result.FORCE;
+        final int currentPlots = Settings.Limit.GLOBAL ?
+                sender.getPlotCount() :
+                sender.getPlotCount(sender.getLocation().getWorldName());
        final PlotArea area = plot.getArea();

-        try (final MetaDataAccess<Integer> metaDataAccess = player.accessPersistentMetaData(PlayerMetaDataKeys.PERSISTENT_GRANTED_PLOTS)) {
+        try (final MetaDataAccess<Integer> metaDataAccess = sender.accessPersistentMetaData(
+                PlayerMetaDataKeys.PERSISTENT_GRANTED_PLOTS
+        )) {
            int grants = 0;
-            if (currentPlots >= player.getAllowedPlots() && !force) {
+            if (currentPlots >= sender.getAllowedPlots() && !forceClaim) {
                if (metaDataAccess.isPresent()) {
                    grants = metaDataAccess.get().orElse(0);
                    if (grants <= 0) {
-                        player.sendMessage(
+                        sender.sendMessage(
                                TranslatableCaption.of("permission.cant_claim_more_plots"),
                                TagResolver.resolver("amount", Tag.inserting(Component.text(grants)))
                        );
                        metaDataAccess.remove();
                    }
                } else {
-                    player.sendMessage(
+                    sender.sendMessage(
                            TranslatableCaption.of("permission.cant_claim_more_plots"),
-                            TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
+                            TagResolver.resolver("amount", Tag.inserting(Component.text(sender.getAllowedPlots())))
                    );
-                    return false;
+                    return;
                }
            }

-            if (!plot.canClaim(player)) {
-                player.sendMessage(TranslatableCaption.of("working.plot_is_claimed"));
-                return false;
+            if (!plot.canClaim(sender)) {
+                sender.sendMessage(TranslatableCaption.of("working.plot_is_claimed"));
+                return;
            }
+
            if (schematic != null && !schematic.isEmpty()) {
                if (area.isSchematicClaimSpecify()) {
                    if (!area.hasSchematic(schematic)) {
-                        player.sendMessage(
+                        sender.sendMessage(
                                TranslatableCaption.of("schematics.schematic_invalid_named"),
                                TagResolver.builder()
                                        .tag("schemname", Tag.inserting(Component.text(schematic)))
                                        .tag("reason", Tag.inserting(Component.text("non-existent")))
                                        .build()
                        );
+                        return;
                    }
-                    if (!player.hasPermission(Permission.PERMISSION_CLAIM_SCHEMATIC
-                            .format(schematic)) && !player.hasPermission(
+
+                    if (!sender.hasPermission(
+                            Permission.PERMISSION_CLAIM_SCHEMATIC.format(schematic)
+                    ) && !sender.hasPermission(
                            "plots.admin.command.schematic"
-                    ) && !force) {
-                        player.sendMessage(
+                    ) && !forceClaim) {
+                        sender.sendMessage(
                                TranslatableCaption.of("permission.no_schematic_permission"),
                                TagResolver.resolver("value", Tag.inserting(Component.text(schematic)))
                        );
+                        return;
                    }
                }
            }
-            if (this.econHandler.isEnabled(area) && !force && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON)) {
-                PlotExpression costExr = area.getPrices().get("claim");
-                double cost = costExr.evaluate(currentPlots);
+
+            if (this.econHandler.isEnabled(area) && !forceClaim) {
+                final PlotExpression costExr = area.getPrices().get("claim");
+                final double cost = costExr.evaluate(currentPlots);
+
                if (cost > 0d) {
                    if (!this.econHandler.isSupported()) {
-                        player.sendMessage(TranslatableCaption.of("economy.vault_or_consumer_null"));
-                        return false;
+                        sender.sendMessage(TranslatableCaption.of("economy.vault_or_consumer_null"));
+                        return;
                    }
-                    if (this.econHandler.getMoney(player) < cost) {
-                        player.sendMessage(
+                    if (this.econHandler.getMoney(sender) < cost) {
+                        sender.sendMessage(
                                TranslatableCaption.of("economy.cannot_afford_plot"),
                                TagResolver.builder()
                                        .tag("money", Tag.inserting(Component.text(this.econHandler.format(cost))))
                                        .tag(
                                                "balance",
-                                                Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(
-                                                        player))))
+                                                Tag.inserting(
+                                                        Component.text(this.econHandler.format(this.econHandler.getMoney(sender)))
+                                                )
                                        )
                                        .build()
                        );
-                        return false;
+                        return;
                    }
-                    this.econHandler.withdrawMoney(player, cost);
-                    player.sendMessage(
+                    this.econHandler.withdrawMoney(sender, cost);
+                    sender.sendMessage(
                            TranslatableCaption.of("economy.removed_balance"),
                            TagResolver.builder()
                                    .tag("money", Tag.inserting(Component.text(this.econHandler.format(cost))))
                                    .tag(
                                            "balance",
-                                            Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(
-                                                    player))))
+                                            Tag.inserting(
+                                                    Component.text(this.econHandler.format(this.econHandler.getMoney(sender)))
+                                            )
                                    )
                                    .build()
                    );
                }
            }
+
            if (grants > 0) {
                if (grants == 1) {
                    metaDataAccess.remove();
                } else {
                    metaDataAccess.set(grants - 1);
                }
-                player.sendMessage(
+                sender.sendMessage(
                        TranslatableCaption.of("economy.removed_granted_plot"),
                        TagResolver.builder()
-                                .tag("used_grants", Tag.inserting(Component.text(grants - 1)))
-                                .tag("remaining_grants", Tag.inserting(Component.text(grants)))
+                                .tag("usedGrants", Tag.inserting(Component.text(grants - 1)))
+                                .tag("remainingGrants", Tag.inserting(Component.text(grants)))
                                .build()
                );
            }
        }
-        if (!player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_BORDER)) {
-            int border = area.getBorder(false);
-            if (border != Integer.MAX_VALUE && plot.getDistanceFromOrigin() > border && !force) {
-                player.sendMessage(TranslatableCaption.of("border.denied"));
-                return false;
+
+        if (!sender.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_BORDER)) {
+            final int border = area.getBorder();
+            if (border != Integer.MAX_VALUE && plot.getDistanceFromOrigin() > border && !forceClaim) {
+                sender.sendMessage(TranslatableCaption.of("border.denied"));
+                return;
            }
        }
-        plot.setOwnerAbs(player.getUUID());
-        final String finalSchematic = schematic;
+
+        // Actually update the owner :)
+        plot.setOwnerAbs(sender.getUUID());
+
        DBFunc.createPlotSafe(plot, () -> {
            try {
                TaskManager.getPlatformImplementation().sync(() -> {
-                    if (!plot.claim(player, true, finalSchematic, false, false)) {
+                    if (!plot.claim(sender, true, event.getSchematic(), false, false)) {
                        LOGGER.info("Failed to claim plot {}", plot.getId().toCommaSeparatedString());
-                        player.sendMessage(TranslatableCaption.of("working.plot_not_claimed"));
+                        sender.sendMessage(TranslatableCaption.of("working.plot_not_claimed"));
                        plot.setOwnerAbs(null);
                    } else if (area.isAutoMerge()) {
-                        PlotMergeEvent mergeEvent = Claim.this.eventDispatcher
-                                .callMerge(plot, Direction.ALL, Integer.MAX_VALUE, player);
+                        final PlotMergeEvent mergeEvent = this.eventDispatcher.callMerge(
+                                plot,
+                                Direction.ALL,
+                                Integer.MAX_VALUE,
+                                sender
+                        );
                        if (mergeEvent.getEventResult() == Result.DENY) {
-                            player.sendMessage(
+                            sender.sendMessage(
                                    TranslatableCaption.of("events.event_denied"),
                                    TagResolver.resolver("value", Tag.inserting(Component.text("Auto merge on claim")))
                            );
@@ -220,11 +216,11 @@ public class Claim extends SubCommand {
                            if (plot.getPlotModificationManager().autoMerge(
                                    mergeEvent.getDir(),
                                    mergeEvent.getMax(),
-                                    player.getUUID(),
-                                    player,
+                                    sender.getUUID(),
+                                    sender,
                                    true
                            )) {
-                                eventDispatcher.callPostMerge(player, plot);
+                                eventDispatcher.callPostMerge(sender, plot);
                            }
                        }
                    }
@@ -235,10 +231,8 @@ public class Claim extends SubCommand {
            }
        }, () -> {
            LOGGER.info("Failed to add plot to database: {}", plot.getId().toCommaSeparatedString());
-            player.sendMessage(TranslatableCaption.of("working.plot_not_claimed"));
+            sender.sendMessage(TranslatableCaption.of("working.plot_not_claimed"));
            plot.setOwnerAbs(null);
        });
-        return true;
    }
-
 }
--- a/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCaptionKeys.java
+++ b/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCaptionKeys.java
@@ -16,16 +16,11 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-package com.plotsquared.core.util.query;
+package com.plotsquared.core.commands;

-import com.plotsquared.core.plot.Plot;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import cloud.commandframework.captions.Caption;

-class HasOwnerFilter implements PlotFilter {
-
-    @Override
-    public boolean accepts(final @NonNull Plot plot) {
-        return plot.hasOwner();
-    }
+public final class PlotSquaredCaptionKeys {

+    public static final Caption ARGUMENT_PARSE_FAILURE_TARGET = Caption.of("argument.parse.failure.target");
 }
--- a/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCommandContainer.java
+++ b/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCommandContainer.java
@@ -16,28 +16,11 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-package com.plotsquared.core.events.post;
-
-import com.plotsquared.core.events.PlotPlayerEvent;
-import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.Plot;
+package com.plotsquared.core.commands;

 /**
- * Called after a {@link Plot} was cleared.
- *
- * @since 7.3.2
+ * Indicates that a class contains commands.
 */
-public class PostPlotClearEvent extends PlotPlayerEvent {
-
-
-    /**
-     * Instantiate a new PostPlotClearEvent.
-     *
-     * @param plotPlayer The {@link PlotPlayer} that initiated the clear.
-     * @param plot       The clearing plot.
-     */
-    public PostPlotClearEvent(final PlotPlayer<?> plotPlayer, final Plot plot) {
-        super(plotPlayer, plot);
-    }
+public interface PlotSquaredCommandContainer {

 }
--- a/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCommandManager.java
+++ b/Core/src/main/java/com/plotsquared/core/commands/PlotSquaredCommandManager.java
@@ -0,0 +1,82 @@
+/*
+ * PlotSquared, a land and world management plugin for Minecraft.
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ * Copyright (C) IntellectualSites team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.commands;
+
+import cloud.commandframework.CommandManager;
+import cloud.commandframework.annotations.AnnotationParser;
+import cloud.commandframework.meta.SimpleCommandMeta;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.plotsquared.core.commands.parsers.PlotMemberParser;
+import com.plotsquared.core.commands.requirements.CommandRequirementBuilderModifier;
+import com.plotsquared.core.commands.requirements.CommandRequirementPostProcessor;
+import com.plotsquared.core.commands.requirements.Requirements;
+import com.plotsquared.core.player.PlotPlayer;
+import io.leangen.geantyref.TypeToken;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+import java.util.stream.Stream;
+
+public class PlotSquaredCommandManager {
+
+    private final Injector injector;
+    private final CommandManager<PlotPlayer<?>> commandManager;
+    private final AnnotationParser<PlotPlayer<?>> annotationParser;
+
+    @Inject
+    public PlotSquaredCommandManager(
+            final @NonNull Injector injector,
+            final @NonNull CommandManager<PlotPlayer<?>> commandManager
+    ) {
+        this.injector = injector;
+        this.commandManager = commandManager;
+        this.annotationParser = new AnnotationParser<PlotPlayer<?>>(
+                this.commandManager,
+                new TypeToken<PlotPlayer<?>>() {
+                },
+                parameters -> SimpleCommandMeta.empty()
+        );
+        this.annotationParser.registerBuilderModifier(Requirements.class, new CommandRequirementBuilderModifier());
+        this.commandManager.registerCommandPostProcessor(new CommandRequirementPostProcessor());
+    }
+
+    /**
+     * Scans the given {@code instance} for commands, and registers them.
+     *
+     * @param instance the instance to scan
+     */
+    public void scanClass(final @NonNull Object instance) {
+        this.annotationParser.parse(instance);
+    }
+
+    /**
+     * Initializes all the known commands.
+     */
+    public void initializeCommands() {
+        // We start by scanning the parsers.
+        Stream.of(
+                PlotMemberParser.class
+        ).map(this.injector::getInstance).forEach(this::scanClass);
+        // Then we scan the commands.
+        Stream.of(
+                CommandAdd.class,
+                CommandClaim.class
+        ).map(this.injector::getInstance).forEach(this::scanClass);
+    }
+}
--- a/Core/src/main/java/com/plotsquared/core/commands/arguments/PlotMember.java
+++ b/Core/src/main/java/com/plotsquared/core/commands/arguments/PlotMember.java
@@ -0,0 +1,94 @@
+/*
+ * PlotSquared, a land and world management plugin for Minecraft.
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ * Copyright (C) IntellectualSites team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.commands.arguments;
+
+import cloud.commandframework.context.CommandContext;
+import com.plotsquared.core.commands.parsers.PlotMemberParser;
+import com.plotsquared.core.database.DBFunc;
+import com.plotsquared.core.player.PlotPlayer;
+import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.UUID;
+
+public sealed interface PlotMember {
+
+    PlotMember EVERYONE = new Everyone();
+
+    default @NonNull UUID uuid(@NonNull CommandContext<PlotPlayer<?>> context) {
+        return this.uuid();
+    }
+
+    @NonNull UUID uuid();
+
+    sealed interface PlayerLike extends PlotMember {
+    }
+
+    record Player(@NonNull UUID uuid) implements PlayerLike {
+    }
+
+    final class LazyPlayer implements PlayerLike {
+
+        private final String candidate;
+        private final UuidSupplier uuidSupplier;
+        private @MonotonicNonNull UUID cachedUuid = null;
+
+        public LazyPlayer(
+                final @NonNull String candidate,
+                final @NonNull UuidSupplier uuidSupplier
+        ) {
+            this.candidate = candidate;
+            this.uuidSupplier = uuidSupplier;
+        }
+
+        public @NonNull UUID uuid() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public synchronized @NonNull UUID uuid(final @NonNull CommandContext<PlotPlayer<?>> context) {
+            if (this.cachedUuid == null) {
+                try {
+                    this.cachedUuid = this.uuidSupplier.uuid();
+                } catch (Exception ignored) {
+                }
+
+                // The player didn't exist :-(
+                if (this.cachedUuid == null) {
+                    throw new PlotMemberParser.TargetParseException(this.candidate, context);
+                }
+            }
+            return this.cachedUuid;
+        }
+
+        @FunctionalInterface
+        public interface UuidSupplier {
+            @Nullable UUID uuid() throws Exception;
+        }
+    }
+
+    final class Everyone implements PlotMember {
+
+        @Override
+        public @NonNull UUID uuid() {
+            return DBFunc.EVERYONE;
+        }
+    }
+}
--- a/Core/src/main/java/com/plotsquared/core/commands/parsers/PlotMemberParser.java
+++ b/Core/src/main/java/com/plotsquared/core/commands/parsers/PlotMemberParser.java
@@ -0,0 +1,124 @@
+/*
+ * PlotSquared, a land and world management plugin for Minecraft.
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ * Copyright (C) IntellectualSites team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.commands.parsers;
+
+import cloud.commandframework.annotations.parsers.Parser;
+import cloud.commandframework.captions.CaptionVariable;
+import cloud.commandframework.context.CommandContext;
+import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
+import cloud.commandframework.exceptions.parsing.ParserException;
+import com.google.inject.Inject;
+import com.plotsquared.core.commands.PlotSquaredCaptionKeys;
+import com.plotsquared.core.commands.arguments.PlotMember;
+import com.plotsquared.core.configuration.Settings;
+import com.plotsquared.core.inject.annotations.ImpromptuPipeline;
+import com.plotsquared.core.player.PlotPlayer;
+import com.plotsquared.core.uuid.UUIDMapping;
+import com.plotsquared.core.uuid.UUIDPipeline;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+import java.io.Serial;
+import java.util.Queue;
+import java.util.UUID;
+
+public class PlotMemberParser {
+
+    private final UUIDPipeline uuidPipeline;
+
+    @Inject
+    public PlotMemberParser(@ImpromptuPipeline final @NonNull UUIDPipeline uuidPipeline) {
+        this.uuidPipeline = uuidPipeline;
+    }
+
+    @Parser
+    public @NonNull PlotMember parse(
+            final @NonNull CommandContext<PlotPlayer<?>> context,
+            final @NonNull Queue<@NonNull String> input
+    ) {
+        final var candidate = input.peek();
+        if (candidate == null) {
+            throw new NoInputProvidedException(this.getClass(), context);
+        }
+
+        if ("*".equals(candidate)) {
+            return PlotMember.EVERYONE;
+        } else if (candidate.length() > 16) {
+            try {
+                return new PlotMember.Player(UUID.fromString(candidate));
+            } catch (IllegalArgumentException ignored) {
+                throw new TargetParseException(candidate, context);
+            }
+        }
+
+        if (Settings.Paper_Components.PAPER_LISTENERS) {
+            try {
+                return this.uuidPipeline.getUUID(candidate, Settings.UUID.NON_BLOCKING_TIMEOUT)
+                        .get()
+                        .map(UUIDMapping::getUuid)
+                        .map(PlotMember.Player::new)
+                        .orElseThrow();
+            } catch (Exception e) {
+                throw new TargetParseException(candidate, context);
+            }
+        } else {
+            return new PlotMember.LazyPlayer(
+                    candidate,
+                    () -> this.uuidPipeline.getUUID(candidate, Settings.UUID.NON_BLOCKING_TIMEOUT)
+                            .get()
+                            .map(UUIDMapping::getUuid)
+                            .orElse(null)
+            );
+        }
+    }
+
+    public static final class TargetParseException extends ParserException {
+
+        @Serial
+        private static final long serialVersionUID = 927476591631527552L;
+        private final String input;
+
+        /**
+         * Construct a new Player parse exception
+         *
+         * @param input   String input
+         * @param context Command context
+         */
+        public TargetParseException(
+                final @NonNull String input,
+                final @NonNull CommandContext<?> context
+        ) {
+            super(
+                    PlotMemberParser.class,
+                    context,
+                    PlotSquaredCaptionKeys.ARGUMENT_PARSE_FAILURE_TARGET,
+                    CaptionVariable.of("input", input)
+            );
+            this.input = input;
+        }
+
+        /**
+         * Get the supplied input
+         *
+         * @return String value
+         */
+        public @NonNull String getInput() {
+            return this.input;
+        }
+    }
+}
--- a/Core/src/main/java/com/plotsquared/core/commands/requirements/CommandRequirement.java
+++ b/Core/src/main/java/com/plotsquared/core/commands/requirements/CommandRequirement.java
@@ -0,0 +1,88 @@
+/*
+ * PlotSquared, a land and world management plugin for Minecraft.
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ * Copyright (C) IntellectualSites team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.commands.requirements;
+
+import cloud.commandframework.meta.CommandMeta;
+import com.plotsquared.core.configuration.caption.Caption;
+import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.player.ConsolePlayer;
+import com.plotsquared.core.player.PlotPlayer;
+import io.leangen.geantyref.TypeToken;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Predicate;
+
+public enum CommandRequirement {
+    PLAYER(
+            "",
+            player -> !(player instanceof ConsolePlayer)
+    ),
+    IN_PLOT(
+            "errors.not_in_plot",
+            player -> player.getCurrentPlot() != null
+    ),
+    PLOT_HAS_OWNER(
+            "info.plot_unowned",
+            player -> Objects.requireNonNull(player.getCurrentPlot()).hasOwner(),
+            IN_PLOT
+    ),
+    IS_OWNER(
+            "permission.no_plot_perms",
+            player -> Objects.requireNonNull(player.getCurrentPlot()).isOwner(player.getUUID()),
+            PLOT_HAS_OWNER
+    );
+
+    public static final CommandMeta.Key<List<CommandRequirement>> COMMAND_REQUIREMENTS_KEY = CommandMeta.Key.of(
+            new TypeToken<List<CommandRequirement>>() {
+            },
+            "command_requirements"
+    );
+
+    private final @NonNull Caption caption;
+    private final @NonNull Predicate<@NonNull PlotPlayer<?>> requirementPredicate;
+    private final @NonNull Set<@NonNull CommandRequirement> inheritedRequirements;
+
+    CommandRequirement(
+            final @NonNull String caption,
+            final @NonNull Predicate<@NonNull PlotPlayer<?>> requirementPredicate,
+            final @NonNull CommandRequirement... inheritedRequirements
+    ) {
+        this.caption = TranslatableCaption.of(caption);
+        this.requirementPredicate = requirementPredicate;
+        this.inheritedRequirements = EnumSet.copyOf(Arrays.asList(inheritedRequirements));
+    }
+
+    public @NonNull Set<@NonNull CommandRequirement> inheritedRequirements() {
+        return Collections.unmodifiableSet(this.inheritedRequirements);
+    }
+
+    public @NonNull Caption caption() {
+        return this.caption;
+    }
+
+    public boolean checkRequirement(final @NonNull PlotPlayer<?> player) {
+        return this.requirementPredicate.test(player);
+    }
+}
--- a/Core/src/main/java/com/plotsquared/core/commands/requirements/CommandRequirementBuilderModifier.java
+++ b/Core/src/main/java/com/plotsquared/core/commands/requirements/CommandRequirementBuilderModifier.java
@@ -0,0 +1,61 @@
+/*
+ * PlotSquared, a land and world management plugin for Minecraft.
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ * Copyright (C) IntellectualSites team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.commands.requirements;
+
+import cloud.commandframework.Command;
+import com.plotsquared.core.player.PlotPlayer;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.BiFunction;
+
+public class CommandRequirementBuilderModifier implements BiFunction<
+        @NonNull Requirements,
+        Command.@NonNull Builder<PlotPlayer<?>>,
+        Command.@NonNull Builder<PlotPlayer<?>>
+> {
+
+    @Override
+    public Command.@NonNull Builder<PlotPlayer<?>> apply(
+            final @NonNull Requirements requirements,
+            final Command.@NonNull Builder<PlotPlayer<?>> builder
+    ) {
+        // We use a list, because we want them to be evaluated in order.
+        final Set<CommandRequirement> commandRequirements = EnumSet.noneOf(CommandRequirement.class);
+        for (final Requirement requirement : requirements.value()) {
+            this.addRequirements(commandRequirements, requirement.value());
+        }
+        // We then sort the requirements.
+        final List<CommandRequirement> sortedRequirements = commandRequirements.stream().sorted().toList();
+        // We then register all the types in the command metadata.
+        return builder.meta(CommandRequirement.COMMAND_REQUIREMENTS_KEY, sortedRequirements);
+    }
+
+    private void addRequirements(
+            final @NonNull Set<@NonNull CommandRequirement> requirements,
+            final @NonNull CommandRequirement requirement
+    ) {
+        for (final CommandRequirement inheritedRequirement : requirement.inheritedRequirements()) {
+            addRequirements(requirements, inheritedRequirement);
+        }
+        requirements.add(requirement);
+    }
+}
--- a/Core/src/main/java/com/plotsquared/core/commands/requirements/CommandRequirementPostProcessor.java
+++ b/Core/src/main/java/com/plotsquared/core/commands/requirements/CommandRequirementPostProcessor.java
@@ -0,0 +1,54 @@
+/*
+ * PlotSquared, a land and world management plugin for Minecraft.
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ * Copyright (C) IntellectualSites team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.commands.requirements;
+
+import cloud.commandframework.Command;
+import cloud.commandframework.execution.postprocessor.CommandPostprocessingContext;
+import cloud.commandframework.execution.postprocessor.CommandPostprocessor;
+import cloud.commandframework.services.types.ConsumerService;
+import com.plotsquared.core.player.PlotPlayer;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+import java.util.List;
+
+public class CommandRequirementPostProcessor implements CommandPostprocessor<PlotPlayer<?>> {
+
+    @Override
+    public void accept(
+            @NonNull final CommandPostprocessingContext<PlotPlayer<?>> context
+    ) {
+        final Command<PlotPlayer<?>> command = context.getCommand();
+        final PlotPlayer<?> player = context.getCommandContext().getSender();;
+        final List<CommandRequirement> commandRequirements = command.getCommandMeta().get(
+                CommandRequirement.COMMAND_REQUIREMENTS_KEY
+        ).orElse(List.of());
+
+        for (final CommandRequirement requirement : commandRequirements) {
+            if (requirement.checkRequirement(player)) {
+                continue;
+            }
+
+            // They failed the requirement =(
+            player.sendMessage(requirement.caption());
+
+            // Then we interrupt to make sure the command isn't executed.
+            ConsumerService.interrupt();
+        }
+    }
+}
--- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/EditSignFlag.java
+++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/EditSignFlag.java
@@ -16,26 +16,20 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-package com.plotsquared.core.plot.flag.implementations;
+package com.plotsquared.core.commands.requirements;

-import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.plot.flag.types.BooleanFlag;
 import org.checkerframework.checker.nullness.qual.NonNull;

-/**
- * @since 7.2.1
- */
-public class EditSignFlag extends BooleanFlag<EditSignFlag> {
-    public static final EditSignFlag EDIT_SIGN_TRUE = new EditSignFlag(true);
-    public static final EditSignFlag EDIT_SIGN_FALSE = new EditSignFlag(false);
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;

-    private EditSignFlag(final boolean value) {
-        super(value, TranslatableCaption.of("flags.flag_description_edit_sign"));
-    }
-
-    @Override
-    protected EditSignFlag flagOf(@NonNull final Boolean value) {
-        return value ? EDIT_SIGN_TRUE : EDIT_SIGN_FALSE;
-    }
+@Repeatable(Requirements.class)
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Requirement {

+    @NonNull CommandRequirement value();
 }
--- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ConcreteHardenFlag.java
+++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ConcreteHardenFlag.java
@@ -16,24 +16,18 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-package com.plotsquared.core.plot.flag.implementations;
+package com.plotsquared.core.commands.requirements;

-import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.plot.flag.types.BooleanFlag;
 import org.checkerframework.checker.nullness.qual.NonNull;

-public class ConcreteHardenFlag extends BooleanFlag<ConcreteHardenFlag> {
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;

-    public static final ConcreteHardenFlag CONCRETE_HARDEN_TRUE = new ConcreteHardenFlag(true);
-    public static final ConcreteHardenFlag CONCRETE_HARDEN_FALSE = new ConcreteHardenFlag(false);
-
-    private ConcreteHardenFlag(boolean value) {
-        super(value, TranslatableCaption.of("flags.flag_description_concrete_harden"));
-    }
-
-    @Override
-    protected ConcreteHardenFlag flagOf(@NonNull Boolean value) {
-        return value ? CONCRETE_HARDEN_TRUE : CONCRETE_HARDEN_FALSE;
-    }
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Requirements {

+    @NonNull Requirement @NonNull[] value();
 }
--- a/Core/src/main/java/com/plotsquared/core/components/ComponentPreset.java
+++ b/Core/src/main/java/com/plotsquared/core/components/ComponentPreset.java
@@ -35,22 +35,34 @@ import java.util.Map;
 * the component GUI
 */
@SerializableAs("preset")
-public record ComponentPreset(
-        ClassicPlotManagerComponent component,
-        String pattern,
-        double cost,
-        String permission,
-        String displayName,
-        List<String> description,
-        ItemType icon
-) implements ConfigurationSerializable {
+public class ComponentPreset implements ConfigurationSerializable {
+
+    private final ClassicPlotManagerComponent component;
+    private final String pattern;
+    private final double cost;
+    private final String permission;
+    private final String displayName;
+    private final List<String> description;
+    private final ItemType icon;
+
+    public ComponentPreset(
+            ClassicPlotManagerComponent component, String pattern, double cost,
+            String permission, String displayName, List<String> description, final ItemType icon
+    ) {
+        this.component = component;
+        this.pattern = pattern;
+        this.cost = cost;
+        this.permission = permission;
+        this.displayName = displayName;
+        this.description = description;
+        this.icon = icon;
+    }

    @SuppressWarnings("unchecked")
    public static ComponentPreset deserialize(final @NonNull Map<String, Object> map) {
        final ClassicPlotManagerComponent classicPlotManagerComponent = ClassicPlotManagerComponent
                .fromString(map.getOrDefault("component", "").toString()).orElseThrow(() ->
-                        new IllegalArgumentException("The preset in components.yml needs a valid target component, got: " + map.get(
-                                "component")));
+                        new IllegalArgumentException("The preset in components.yml needs a valid target component, got: " + map.get("component")));
        final String pattern = map.getOrDefault("pattern", "").toString();
        final double cost = Double.parseDouble(map.getOrDefault("cost", "0.0").toString());
        final String permission = map.getOrDefault("permission", "").toString();
@@ -62,6 +74,34 @@ public record ComponentPreset(
        );
    }

+    public ClassicPlotManagerComponent getComponent() {
+        return this.component;
+    }
+
+    public String getPattern() {
+        return this.pattern;
+    }
+
+    public double getCost() {
+        return this.cost;
+    }
+
+    public String getPermission() {
+        return this.permission;
+    }
+
+    public String getDisplayName() {
+        return this.displayName;
+    }
+
+    public List<String> getDescription() {
+        return this.description;
+    }
+
+    public ItemType getIcon() {
+        return this.icon;
+    }
+
    @Override
    public Map<String, Object> serialize() {
        final Map<String, Object> map = new HashMap<>();
--- a/Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java
+++ b/Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java
@@ -165,8 +165,8 @@ public class ComponentPresetManager {

        final List<ComponentPreset> allowedPresets = new ArrayList<>(this.presets.size());
        for (final ComponentPreset componentPreset : this.presets) {
-            if (!componentPreset.permission().isEmpty() && !player.hasPermission(
-                    componentPreset.permission()
+            if (!componentPreset.getPermission().isEmpty() && !player.hasPermission(
+                    componentPreset.getPermission()
            )) {
                continue;
            }
@@ -200,30 +200,30 @@ public class ComponentPresetManager {
                    return false;
                }

-                final Pattern pattern = PatternUtil.parse(null, componentPreset.pattern(), false);
+                final Pattern pattern = PatternUtil.parse(null, componentPreset.getPattern(), false);
                if (pattern == null) {
                    getPlayer().sendMessage(TranslatableCaption.of("preset.preset_invalid"));
                    return false;
                }

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

    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Config.class.getSimpleName());

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

+        public Collection<String> getSections() {
+            return INSTANCES.keySet();
+        }
+
        private Map<String, T> getRaw() {
            return INSTANCES;
        }
--- a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java
@@ -194,7 +194,7 @@ public class Settings extends Config {
        public List<String> WORLDS = new ArrayList<>(Collections.singletonList("*"));


-        @Comment("See: https://intellectualsites.gitbook.io/plotsquared/optimization/plot-analysis for a description of each value.")
+        @Comment("See: https://intellectualsites.github.io/plotsquared-documentation/optimization/plot-analysis for a description of each value.")
        public static final class CALIBRATION {

            public int VARIETY = 0;
@@ -214,7 +214,7 @@ public class Settings extends Config {


    @Comment({"Chunk processor related settings",
-            "See https://intellectualsites.gitbook.io/plotsquared/optimization/chunk-processor for more information."})
+            "See https://intellectualsites.github.io/plotsquared-documentation/optimization/chunk-processor for more information."})
    public static class Chunk_Processor {

        @Comment("Auto trim will not save chunks which aren't claimed")
@@ -280,7 +280,7 @@ public class Settings extends Config {
        @Comment("Always show explosion Particles, even if explosion flag is set to false")
        public static boolean ALWAYS_SHOW_EXPLOSIONS = false;
        @Comment({"Blocks that may not be used in plot components",
-                "Checkout the wiki article regarding plot components before modifying: https://intellectualsites.gitbook.io/plotsquared/customization/plot-components"})
+                "Checkout the wiki article regarding plot components before modifying: https://intellectualsites.github.io/plotsquared-documentation/customization/plot-components"})
        public static List<String>
                INVALID_BLOCKS = Arrays.asList(
                // Acacia Stuff
@@ -402,7 +402,7 @@ public class Settings extends Config {


    @Comment({"Schematic Settings",
-            "See https://intellectualsites.gitbook.io/plotsquared/schematics/schematic-on-claim for more information."})
+            "See https://intellectualsites.github.io/plotsquared-documentation/schematics/schematic-on-claim for more information."})
    public static final class Schematics {

        @Comment(
@@ -522,7 +522,7 @@ public class Settings extends Config {
        @Comment("Should the limit be global (over multiple worlds)")
        public static boolean GLOBAL =
                false;
-        @Comment({"The max range of integer permissions to check for, e.g. 'plots.plot.127' or 'plots.set.flag.mob-cap.127'",
+        @Comment({"The max range of permissions to check for, e.g. plots.plot.127",
                "The value covers the permission range to check, you need to assign the permission to players/groups still",
                "Modifying the value does NOT change the amount of plots players can claim"})
        public static int MAX_PLOTS = 127;
@@ -531,7 +531,7 @@ public class Settings extends Config {


    @Comment({"Backup related settings",
-            "See https://intellectualsites.gitbook.io/plotsquared/plot-backups for more information."})
+            "See https://intellectualsites.github.io/plotsquared-documentation/plot-backups for more information."})
    public static final class Backup {

        @Comment("Automatically backup plots when destructive commands are performed, e.g. /plot clear")
@@ -783,7 +783,7 @@ public class Settings extends Config {
        public static boolean
                PERSISTENT_ROAD_REGEN = true;
        @Comment({"Enable the `/plot component` preset GUI",
-                "Read more about components here: https://intellectualsites.gitbook.io/plotsquared/customization/plot-components"})
+                "Read more about components here: https://intellectualsites.github.io/plotsquared-documentation/customization/plot-components"})
        public static boolean COMPONENT_PRESETS = true;
        @Comment("Enable per user locale")
        public static boolean PER_USER_LOCALE = false;
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/Caption.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/Caption.java
@@ -40,10 +40,8 @@ public interface Caption {
     *
     * @param localeHolder Locale holder
     * @return {@link ComponentLike}
-     * @since 7.0.0
+     * @since TODO
     */
    @NonNull Component toComponent(@NonNull LocaleHolder localeHolder);

-    @NonNull String toString();
-
 }
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionHolder.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionHolder.java
@@ -51,7 +51,7 @@ public class CaptionHolder {
     * Get the {@link TagResolver}s to use when resolving tags in the {@link Caption}.
     *
     * @return The tag resolvers to use.
-     * @since 7.0.0
+     * @since TODO
     */
    public TagResolver[] getTagResolvers() {
        return this.tagResolvers;
@@ -61,7 +61,7 @@ public class CaptionHolder {
     * Set the {@link TagResolver}s to use when resolving tags in the {@link Caption}.
     *
     * @param tagResolvers The tag resolvers to use.
-     * @since 7.0.0
+     * @since TODO
     */
    public void setTagResolvers(TagResolver... tagResolvers) {
        this.tagResolvers = tagResolvers;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alexander Söderberg	99133ee485	port over alias :)	2023-05-13 16:53:56 +02:00
Alexander Söderberg	e415dcc8a4	port claim :)	2023-03-09 06:34:15 +01:00
Alexander Söderberg	f2da7cbdc9	implement the command requirement logic	2023-03-04 12:57:14 +01:00
Alexander Söderberg	f175c24523	implement a command and write a sample parser	2023-03-04 07:51:10 +01:00
Alexander Söderberg	f3f44b55c4	Merge remote-tracking branch 'origin/v7' into feature/v7/cloud	2023-03-02 06:33:16 +01:00
Alexander Brandes	b946f31fe3	Merge branch 'v7' into feature/v7/cloud	2023-02-12 18:37:22 +01:00
Alexander Söderberg	6bb1ebe1a1	add some simple command creation logic	2023-01-17 09:45:12 +01:00
Alexander Söderberg	ab64836fc0	create the bindings	2023-01-17 09:30:15 +01:00
Alexander Söderberg	d932d2eae6	feat: cloud commands	2023-01-17 09:12:04 +01:00